[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

A merge question

From: Tobias Ringström <tobias_at_ringstrom.mine.nu>
Date: 2003-02-15 18:49:13 CET

I discovered Subversion some time ago (thanks to the BitKeeper
flame-wars on LKML), and I'm already using Subversion with great
success for a couple of repositories. Great work, people!

The biggest challenge for a version management system according to my
experience is how gracefully it handles merging between branches. I
suspect that the merging implementation is not fully developed, but
I'm very curious as to what the plans are in this area.

To be more specific, I'm thinking of a situation that is completely
hopeless when using CVS (and many other systems). Let's say that the
trunk is branched for a 1.0 release. After this branch, the directory
structure of the trunk is reorganized by renaming and/or moving files
around. After this stage a bug-fixed is commited to either branch,
and needs to be merged to the other branch. If the change only
affects a single file, it is quite easy to do it manually, but if the
change spans several files, it becomes a real pain to do manually.

Are there any plans to add such support to Subversion?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 16 04:55:48 2003

This is an archived mail posted to the Subversion Dev mailing list.