So we’re gradually moving all our projects across into SVN, from CVS.
One project in particular has two parallel development streams that share a lot of code, and they accomplish this with a neat trick on branch tags.
Some files are branched normally as they diverge on the different streams:
foo.c
- 1.18 — HEAD, VERSION-1-BRANCH
- 1.15.2.10 — VERSION-2-BRANCH
Others don’t differ between the branches, and are ‘shared’ between the branches. Any updates automatically get included in both branches:
bar.c
- 1.25 — HEAD, VERSION-1-BRANCH, VERSION-2-BRANCH
As far as I can see, there’s no way to accomplish this same ‘linking’ of branches in subversion, on a file-by-file basis. Someone please tell me it isn’t so?
Since Subversion 1.6 there has been support for the svn:externals property at a file level. In previous versions it only worked on a directory basis