> in CVSNT there's a feature called magic branches. Basically it > means that > if you branch from head (or any other branch) the all the files in > the > magic branch will continue to have all changes made in the future > until > the point where you change them. So if you have 20 files and you > change > only a small number of them you only have to merge changes to the > files > you modified, the others always have changes in the trunk. > Is the only option in Subversion to merge the trunk to the branch > regulary
Yes, pretty much. BOb