[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: Chris AtLee <catlee_at_sidefx.com>
Date: 2005-04-26 15:27:23 CEST

On Thu, 2005-10-03 at 22:35 -0500, John Belmonte wrote:
> 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.

Sorry, I'm a bit late to this party, but I just started looking at
svnmerge for use in my company.

Can you explain in a bit more detail why bi-directional merges break


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 26 15:34:18 2005

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