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

conflict marker bikeshed

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-03-12 20:42:18 CET

So I'm almost done with the patch that has 'svn update' using diff3
instead of diff+patch. (Boy oh boy, a lot of code shrunk!)

I'm noticing that diff3 is capable of creating conflict markers with 2
sections (a la CVS), or optionally with 3 sections instead.

I personally like the 3-part markers, but Karl likes the 2-part ones.
But guess what? This is a preference that a user ought to be able to
configure in the ~/.subversion/ area. I think I'll file an issue on
this. :-)

Here's sample output, by the way:

[sussman@kepler:~/projects/test/wc2]$ /usr/bin/diff3 -E -m -L ".mine" -L ".r1" -L ".r4" ./iota.61032.00001.tmp ./.svn/text-base/iota.svn-base ./.svn/tmp/text-base/iota.svn-base
<<<<<<< .mine
This is the file 'iota'.maoeuhaoeuht
=======
This is the file 'iota'.blah
>>>>>>> .r4
[sussman@kepler:~/projects/test/wc2]$ /usr/bin/diff3 -A -m -L ".mine" -L ".r1" -L ".r4" ./iota.61032.00001.tmp ./.svn/text-base/iota.svn-base ./.svn/tmp/text-base/iota.svn-base
<<<<<<< .mine
This is the file 'iota'.maoeuhaoeuht
||||||| .r1
This is the file 'iota'.
=======
This is the file 'iota'.blah
>>>>>>> .r4

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 12 20:40:20 2002

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