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

Re: A merge question

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2003-02-18 04:00:41 CET

Tobias Ringström <tobias@ringstrom.mine.nu> writes:
> 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?

Yes, but not before 1.0. We track more history than we use,
currently. Getting Merge Right is an ancient and venerable topic on
this list -- search the archives, you'll see what I mean :-) -- and
there will always be room for improvement. Right now, we're trying to
match CVS's functionality, plus do better where it's relatively easy
to do better (i.e., grab low hanging fruit).


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 18 04:33:46 2003

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