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

Re: [merge tracking] Interactive conflict resolving in the cmdline client

From: Giovanni Bajo <rasky_at_develer.com>
Date: 2007-01-25 01:02:10 CET

On 25/01/2007 0.00, Daniel Rall wrote:

> Implementing this behavior as an external program is somewhat
> difficult, and leaves us little better off in terms of interface
> between Subversion's libraries and the conflict resolution mechanism
> than we are today with the external merge tool.

I don't see exactly why. In svnmerge.py (and SVN 1.5) I think it would be
reasonable to just stop at the first conflict and ask the user to retry. We
just want to make sure that the property is correctly "flushed" before we bail
out. The user can then fix the conflict in whatever form he pleases, and rerun
the *same* command line, which will just continue the merge.

Giovanni Bajo
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 25 01:03:12 2007

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