[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: Sean Russell <ser_at_germane-software.com>
Date: 2002-02-09 02:37:42 CET

Hash: SHA1

On Friday 08 February 2002 03:10 pm, you wrote:
> I didn't mean to leave the list out -- if you'd like, feel free to direct
> your reply to this email back to the list. I'm resending my original
> reply.

You left it out because I left it out. I'm being a bonehead today, and I
keep selecting 'reply' instead of 'reply-to-all'.

> Sure, that's fine. Yes, I would use the +/- notation in those cases -- but
> it's pretty simple to tell. Always use a "!" for a line change if you're
> the local file; use "!" notation for the remote version if the local
> version didn't change that line; use +/- notation for the remote version if
> the local version DID change the line.

Right. This is even more logic than what I'm using. Right now I'm
struggling with the 3-way-diff thing. The line numbers are giving me trouble

> Why not use diff3?

Because I'd rather not add a dependancy to the SVN tools. diff3 is probably
scarce on Windows and Mac clients.

- --
 |.. "If we are what we eat, then the only real humans are cannibals."
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org


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.