On Tue, Jul 22, 2003 at 08:52:36PM -0500, cmpilato@collab.net wrote:
> "James Goodall" <jgoodall@dmetrix.com> writes:
>
> > svn: start_handler: error processing command 'merge' in ''
> >
> > svn: Error calling external program
> >
> > svn: svn_io_run_diff3: Error running 'C:\Cygwin\bin\diff3.exe': exitcode
> > was 2, args were:
>
> Dudes. Go *right now* and comment out the diff-cmd,
> diff3-cmd, and diff3-has-program-arg options! Subversion
> has new(er) hotness -- an internal diff/merge library,
> compliments of Sander Striker.
Two points:
1. The internal diff doesn't accept some of the handier diff
options, such as '-b'.
2. Isn't hosing the wc a somewhat inelegant way of suggesting to
the user that something is wrong?
BTW I mentioned this problem on dev@ 4 months ago (see below),
but I imagine other issues were more pressing. I've not tested
whether current versions still do this.
Bruce
Date: Wed, 19 Mar 2003 11:43:39 -0500
From: Bruce DeVisser <bmdmail@look.ca>
Subject: Bug: update trashes WC
To: dev@subversion.tigris.org
This is using the precompiled svn 0.19.0 on W2K, and
ra_local access.
If diff3 is flakey and returns failure, an update which
requires merging of code can leave the WC unusable. In my
case, I was using GNU diff3 compiled for win32 (but
apparently there is something wrong with it or with my
setup). Operation is correct if I use the internal diff3,
but not correctable if I first run with the bogus diff3
(thereby destabilising things) and then modify the config
file to revert to the internal diff3.
I am attaching a log showing the sequence of commands to
reproduce this error minimally, and the responses given to
the commands. Also attached is a copy of the entire WC
directory in a zip file.
Bruce
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 24 04:14:01 2003