You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Michael Tanaka at Home <sc...@scatterbrain.co.uk> on 2002/05/14 20:46:44 UTC
Problems with SVN Windows Client
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----
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).
Any help appreciated.
Michael Tanaka
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Problems with SVN Windows Client
Posted by Philip Martin <ph...@codematters.co.uk>.
Michael Tanaka at Home <sc...@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
Re: Problems with SVN Windows Client
Posted by Branko Čibej <br...@xbc.nu>.
Michael Tanaka at Home wrote:
>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----
>
>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.
>
Do you even _have_ diff3 where svn is looking for it?
>
>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).
>
>Any help appreciated.
>
>Michael Tanaka
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
>
--
Brane Čibej <br...@xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Problems with SVN Windows Client
Posted by cm...@collab.net.
Michael Tanaka at Home <sc...@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