You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Sebastien Cevey <se...@cine7.net> on 2003/02/06 19:50:04 UTC
Merge crashes under windows
Hello
I have experienced a bug with merge (and diff is the same I think)
under windows. I have seen the following post about this matter on the
list:
From: Leandro Lucarella <ll...@mecon.gov.ar>
Date: Tue, 4 Feb 2003 13:10:59 -0300
Subject: Merge problems.
Hi. I'm having a problem trying to make my first merge without
success.
Here is the message:
$ svn merge -r21:22 ../proto
/usr/bin/diff3: unrecognized option `--diff-program=/usr/bin/diff'
/usr/bin/diff3: Try `/usr/bin/diff3 --help' for more information.
svn: Error calling external program
svn: svn_io_run_diff3: Error running /usr/bin/diff3: exitcode was 2,
args were:
in directory ., basenames:
administracion.epl.tmp
administracion.epl.tmp.tmp
administracion.epl.tmp.2.tmp
[...]
to which Philip Martin replied with :
It looks like your Subversion is expecting a 2.8 style GNU diff but
is finding a 2.7 one. You can set
diff3-has-program-arg = false
in your ~/.subversion/config
which fixed the problem for Leandro Lucarella.
I had exactly the same error, so I tried to edit my
C:\Windows\Application Data\Subversion\config file :
[helpers]
# editor-cmd = editor (vi, emacs, notepad, etc.)
diff-cmd = C:\Cygwin\bin\diff.exe
diff3-cmd = C:\Cygwin\bin\diff3.exe
diff3-has-program-arg = false
it solved the problem for me (svn-0.17.0 win98).
However, the people I am working with (svn-0.17.0 winXP) had the same
problem, made the same changes, but it did *not* solve the merge
problem for them.
This is particularly problematic since it prevents anybody to update a
modified file if that file was modified in the repository, which is
just one of the great advantages of SCM of course.
I am therefore looking for help, because the "official fix" doesn't
seem to work :(
Here are some commands my friend entered, with error messages :
I:\Prog Milcis\Milcis\unstable\Scripts_Admin>svn commit Testbenchall.txt
svn: Attempted to lock an already-locked dir
svn: working copy locked: I:/Prog Milcis/Milcis/unstable/Scripts_Admin
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
I:\Prog Milcis\Milcis\unstable\Scripts_Admin>svn cleanupow
svn: Problem running log
svn: in directory
svn: start_handler: error processing command 'merge' in
svn: Error calling external program
svn: svn_io_run_diff3: Error running C:\Program Files\Subversion\helpers\cygdiff\diff3.exe: exitcode was 2, args were:
in directory ., basenames:
Testbenchall.txt.tmp
Testbenchall.txt.tmp.tmp
Testbenchall.txt.tmp.2.tmp
I:\Prog Milcis\Milcis\unstable\Scripts_Admin>dir
Le volume dans le lecteur I s'appelle PERSO
Le numéro de série du volume est 609A-587B
Répertoire de I:\Prog Milcis\Milcis\unstable\Scripts_Admin
05/02/2003 00:45 <REP> .
05/02/2003 00:45 <REP> ..
05/02/2003 00:41 <REP> .svn
05/02/2003 00:45 1 249 diff.exe.stackdump
11/05/2001 02:33 269 Exemple.txt
04/02/2003 21:48 586 Testbench1.txt
04/02/2003 21:52 301 Testbench2.txt
04/02/2003 21:51 239 Testbench3.txt
04/02/2003 21:53 2 899 Testbenchall.txt
05/02/2003 00:45 0 Testbenchall.txt.2.tmp
05/02/2003 00:45 2 899 Testbenchall.txt.tmp
05/02/2003 00:45 2 899 Testbenchall.txt.tmp.2.tmp
05/02/2003 00:45 2 767 Testbenchall.txt.tmp.tmp
10 fichier(s) 14 108 octets
3 Rép(s) 350 900 224 octets libres
[ right, this was cleanup not update, but the message is similar. ]
Is there any known solution or workaround for this problem ?
Thank you !
--
Sebastien Cevey <se...@cine7.net>
Cine7.Net - Milcis.Net
Jabber: theefer@charente.de - ICQ: 48895760
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge crashes under windows
Posted by Philip Martin <ph...@codematters.co.uk>.
Sebastien Cevey <se...@cine7.net> writes:
> $ svn merge -r21:22 ../proto
> /usr/bin/diff3: unrecognized option `--diff-program=/usr/bin/diff'
> /usr/bin/diff3: Try `/usr/bin/diff3 --help' for more information.
Note the two lines above.
> svn: Error calling external program
> svn: svn_io_run_diff3: Error running /usr/bin/diff3: exitcode was 2,
> args were:
> in directory ., basenames:
> administracion.epl.tmp
> administracion.epl.tmp.tmp
> administracion.epl.tmp.2.tmp
[snip]
> I:\Prog Milcis\Milcis\unstable\Scripts_Admin>svn cleanupow
> svn: Problem running log
> svn: in directory
> svn: start_handler: error processing command 'merge' in
Note the absence of the "unrecognized option" message -- that's
because this is a different error. In this case the solution is
probably http://subversion.tigris.org/project_faq.html#diff3-diff
> svn: Error calling external program
> svn: svn_io_run_diff3: Error running C:\Program Files\Subversion\helpers\cygdiff\diff3.exe: exitcode was 2, args were:
> in directory ., basenames:
> Testbenchall.txt.tmp
> Testbenchall.txt.tmp.tmp
> Testbenchall.txt.tmp.2.tmp
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org