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

RE: RE: Problems with SVN Windows Client

From: Michael Tanaka at Home <scatterbrain_at_scatterbrain.co.uk>
Date: 2002-05-15 01:18:31 CEST

I've double checked both the diff.exe and diff3.exe and both are in
C:\Program Files\cygnus\cygwin\bin (or c:\progra~1\cygnus\cygwin\bin\ I've
also double checked the permissioning (I'm running Windows XP) and they are
wide open. I'm still getting the error detailed in the message immediately
below.

Out of interest, why is the default position for SVN to find the diff.exe
and diff3.exe in the c:\Program Files\cygnus\cygwin\bin\ ? Installing Cygwin
and associated files immediately flags this as a bad location (it hates the
space in the path).

Has anyone else had similar windows SVN client experiences? Specially
focused around the diff.exe and diff3.exe .

Also, in a previous reply cmpilato@collab.net mentioned that he had seen a
similar error before and noticed that one of his tmpfiles was zero-length.
I'm seeing the same thing although I know my diff should come up with a
value. Is this simply a legacy of the failed diff3.exe run or something more
telling?

-----Original Message-----
From: Philip Martin [mailto:pm@ultra22.uk2net.com]On Behalf Of Philip
Martin
Sent: 14 May 2002 22:30
To: Michael Tanaka at GLO Ltd
Subject: Re: Problems with SVN Windows Client

Michael Tanaka at GLO Ltd <michael@gloltd.com> writes:

> Philip,
>
> I think I can get diff working from a command line. Using the full path to
> diff.exe returns the difference between two files so I think that looks
good
> although I'm no expert. Using the full path to the diff3.exe and the files
> given in the order of my error printout below as arguments gives me:
>
> ----start----
> diff: not found
> /cygdrive/c/progra~1/cygnus/cygwin/bin/diff3: subsidiary diff failed
> ----end----
>
> Looks pretty bad to me although I'm not certain if I'm using diff3.exe
> correctly. The path looks entirely messed up as well, is this an
indication
> of the problem or just a couple of printouts over-running? As a side note,
> changing the order of the arguments doesn't seem to make a difference.

The diff3 program works by running the diff program twice, that is
diff3 itself invokes diff. I guess the diff3 program is failing to
locate the diff executable.

It might be best to take this back to the list; I don't use windows so
I don't know what to suggest to fix it.

-- 
Philip
-----Original Message-----
From: Philip Martin [mailto:pm@amber.propagation.net]On Behalf Of Philip
Martin
Sent: 14 May 2002 21:57
To: Michael Tanaka at Home
Cc: 'dev@subversion.tigris.org'
Subject: Re: Problems with SVN Windows Client
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----
Well, this has failed because the external diff3 program has returned
the value 2.  According to the Linux manpage
       An exit status of 0 means diff3 was  successful,  1  means
       some conflicts were found, and 2 means trouble.
Can you get diff3 to work from the windows command line?
> 
> Reversing the process so the Linux SVN client gets the conflict and has to
> be updated seems to go without a hitch so this leads me to believe
something
> is wrong in my windows set-up.
> 
> Does anyone have any suggestions?
> 
> Also, after making some unrelated (or I think should be unrelated) changes
> and trying again to update the windows client I get the following error:
> 
> ----start----
> svn_error: #21038 : <Attempting to lock an already-locked dir>
>     working copy locked: wc1/Perl/samplefilesandscript
> ----end----
> 
> Should I be worried about this? I don't feel as concerned about this error
> as I realise the previous process aborted prematurely and should not be a
> running error (big assumption on my part).
The 'svn cleanup' command is available to clean up locks, etc.
-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 15 01:16:31 2002

This is an archived mail posted to the Subversion Dev mailing list.