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

Re: Subversion moving problem

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2001-11-28 01:57:55 CET

Sorry, Jack... can you send an exact recipe? Like, an exact list of
commands to type that will reproduce this bug?

I appreciate the testing. :-)

Jack Huang <HuangJ@masirv.com> writes:

> Hello again,
>
> I am getting errors when I tried to commit a file move. First I created
> directory Qwerty with "svn mkdir Qwerty", then I created text file foo.c
> under Qwerty. I then made another directory under Qwerty, Dvorak, and
> issued "svn move foo.c Dvorak/", which gave me the following:
>
> Deleting Qwerty/foo.c
> Adding Qwerty/Dvorak/foo.c
>
> svn_error: #21062 : <Merge conflict during commit>
> commit failed: wc locks and tmpfiles have been removed.
>
> svn_error: #21062 : <Merge conflict during commit>
> commit failed: while calling close_edit()
>
> svn_error: #21062 : <Merge conflict during commit>
> conflict at "Qwerty"
>
> I then called "svn copy foo.c bar.c", which did create bar.c in my working
> directory, but everytime I enter "svn commit" I get above messages plus:
>
> Adding Qwerty/bar.c
>
> So I will have to assume that Subversion have not commited bar.c to the
> repository.
>
> I have downloaded the latest and greated release r464, and since both log
> and cp worked, Subversion 0.6.
>
> Thanks for your helps.
>
> Jack
>
> ---------------------------------------------------------------------
> 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 Sat Oct 21 14:36:49 2006

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