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

Re: Patch command execution

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-02-08 23:37:10 CET

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 <<<<<<<<<<<<<

but I really don't think it matters so much.

Are you doing this by scripting diff3, or writing it from scratch? (I
haven't thought carefully about it, but it seems like this could be
essentially a wrapper around diff3?)


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

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.