Karl Fogel <kfogel@newton.ch.collab.net> writes:
> Sean Russell <ser@germane-software.com> writes:
> > How do you want the markup to appear in the modified local file? I
> > wanted to represent all three sets of information, so I was going to
> > use a modified CVS markup:
> >
> > >>>>>>>>>> ORIGINAL
> > ... original file lines here
> > ========== REPOSITORY
> > ... repository version lines here
> > ========== LOCAL
> > ... local file lines here
> > <<<<<<<<<< END
>
> Nice! I'll paint the bikeshed by offering this
>
> >>>>>>>>>> ORIGINAL (revision X) >>>>>>>>>
> ... original file lines here
> ========== LOCAL (modifications to revision X) =========
> ... local file lines here
> ========== REPOSITORY (revision Y) =========
> ... repository version lines here
> <<<<<<<<<< END <<<<<<<<<<<<<
Another bikeshed: I think the arrows are reversed. IOW, in CVS the
markers look like
<<<<
====
>>>>
I tend to think of the conflict as living inside a giant XML tag. :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006