[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problems with SVN Windows Client

From: <cmpilato_at_collab.net>
Date: 2002-05-14 23:08:40 CEST

Michael Tanaka at Home <scatterbrain@scatterbrain.co.uk> writes:

> I'm currently testing/using a SVN windows client from the precompiled binary
> r1868, against a repository on a Linux SVN server built on 29th April 2002.
> I'm forcing a conflict by checking-out/changing/committing with another
> Linux SVN client before updating the modified working copy from the windows
> client and on updating the windows working copy get the error:
> ----start----
> svn_error: #21041 : <Problem running log>
> in directory wc1/Perl/samplefilesandscript
> svn_error: #21041 : <Problem running log>
> start_handler: error processing command 'merge' in
> wc1/Perl/samplefilesandscript
> svn_error: #21083 : <Error calling external program>
> svn_wc_merge<> returned an unexpected error
> svn_error: #21083 : <Error calling external program>
> Error running c:\progra~1\cygnus\cygwin\bin\diff3.exe: exitcode was 2,
> args were:
> in directory wc1/Perl/samplefilesandscript, basenames:
> filetransfer.pl.62724.00001.tmp
> filetransfer.pl.62616.00001.tmp
> filetransfer.pl.62620.00001.tmp
> ----end----

The last time I got this error I noticed that one of my tmpfiles was
zero-length. Can diff3 handle this successfully? Was that file
supposed to be zero-length? I dunno.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 14 23:09:32 2002

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.