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

Re: svn commit: r25636 - in trunk/subversion: include libsvn_client libsvn_wc svn

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-07-03 21:25:07 CEST

On 7/3/07, sussman@tigris.org <sussman@tigris.org> wrote:
> Author: sussman
> Date: Tue Jul 3 12:14:33 2007
> New Revision: 25636
> Log:
> Make 'svn up' call the conflict-callback on basic file conflicts.

Actuall, not just 'svn up', but 'svn merge' as well. If you take our
dummy no-op conflict-callback and uncomment the bit which makes it
print information about the conflict, you see something like this:

$ svn merge file:///home/sussman/homedir/scratch/boorepos -r3:4 .
--- Merging r4:
Discovered a conflict.

Path: cvs2cl.pl
Node kind: file
Binary file?: no
Attempting to edit object.
But: existing object has conflicting edits.
  Ancestor file: /tmp/tmp
  Repository's file: .svn/tmp/tempfile.2.tmp
  User's file: cvs2cl.pl
  File with conflict markers: .svn/tmp/tempfile.3.tmp

C cvs2cl.pl

My intent now is to make the conflict callback get invoked in more
places, such as times when an addition is obstructed, or when
edits/deletes clash.

It also opens up the door for someone to write a "good" conflict
resolution callback, perhaps something like what p4 or svk has.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 3 21:24:58 2007

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.