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

Re: svnmerge script

From: John Belmonte <john_at_neggie.net>
Date: 2005-03-11 04:35:57 CET

Chris Morgan wrote:
> We were wondering whether it would be productive to work on moving the
> svnmerge script into the subversion code to fill the hole of "merge
> tracking" in the roadmap. What kinds of opinions do people have about
> the svnmerge implementation vs. the vision for merge tracking as
> specified on the roadmap?

svnmerge breaks down when you want to do bi-directional merges.
Briefly, there is a loss of information when you do an "svnmerge merge",
because the automatic merge is mixed together with any subsequent
changes you make before the commit (e.g. to resolve conflicts). To
support a bi-directional merge, you need to be able to separate those
two parts.

--John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 11 04:37:15 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.