[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    Re: [Issue 1119] New - svn commit/cleanup fails because of diff3
From:       Michael Wood <mwood () its ! uct ! ac ! za>
Date:       2003-01-28 7:37:15
[Download RAW message or body]

On Mon, Jan 27, 2003 at 07:10:07PM -0000, issues@subversion.tigris.org wrote:
> http://subversion.tigris.org/issues/show_bug.cgi?id=1119
> 
[snip]
> + Tried to "svn commit" a file; it failed because diff3 failed.  Now I must 
> + do "svn cleanup", but it fails every time with this message:
> + 
> + >>> svn cleanup
> + 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:
> + InstantAlbums.rc.3.tmp
> + InstantAlbums.rc.3.tmp.tmp
> + InstantAlbums.rc.3.tmp.2.tmp
> + 
> + If I try to run diff3 myself on these files it works (the 'cygdiff' directory 
> + is on the path).  I'm using svn-0.17.1-r4503-setup.exe.
[snip]

Have a look at http://subversion.tigris.org/project_faq.html#diff3-diff
("I get exitcode 2 from diff3 on Windows" in the FAQ)

-- 
Michael Wood <mwood@its.uct.ac.za>

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@subversion.tigris.org
For additional commands, e-mail: issues-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]