On Fri, Feb 08, 2002 at 05:37:42PM -0800, Sean Russell wrote:
> > 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
> :-)
I really think you're barking up the wrong tree trying to fake these
conflict markers given patch output. Patch *will* fail in cases where
diff3 -m will succeed.
To put it another way - this thread started because we were looking
for a solution to issue #563. Using diff3 will solve that problem.
Continuing to use patch won't.
And I know how to fake .rej files using diff3, so the bikeshed doesn't
enter into the discussion.
> > 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.
Not so. It is bundled with GNU diff, which is either the system-
provided diff, or easy to install, on all platforms of interest. We
do want a librarized diff/diff3 eventually but that is a separate
problem which should not hold up #563.
As a side note, on IRC ben asked people to wait on this project until
next week because he has massive outstanding changes in get_editor.c
(to implement svn switch on a single file).
zw
ps. Is there any way you can get your mail client to generate
In-Reply-To and/or References headers?
---------------------------------------------------------------------
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