You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by François Beausoleil <fb...@ftml.net> on 2005/04/28 18:26:38 UTC
Unable to commit after removing added folder
Hi !
If I add a folder, and then I remove the folder by mistake (using the
OS' tools), then the WC cannot be recovered, short of playing with the
.svn/ area.
Here's a Win32 repro recipe:
rd /s/q repos wc
cls
svn --version
svnadmin create --fs-type=fsfs repos
svn co file:///repos wc
cd wc
md dira dirb
svn add dira dirb
rd /s/q dirb
svn status
svn update
md dirb
svn update
svn commit
svn status
And here's a sample run, on WinXP SP2 (fr-CA):
$ svn --version
svn, version 1.2.0 (Release Candidate 2)
compiled Apr 22 2005, 08:25:36
$ svnadmin create --fs-type=fsfs repos
$ svn co file:///repos wc
Checked out revision 0.
$ cd wc
$ md dira dirb
$ svn add dira dirb
A dira
A dirb
$ rd /s/q dirb
$ svn status
A dira
! dirb
$ svn update
At revision 0.
$ md dirb
$ svn update
At revision 0.
$ svn commit
svn: Commit failed (details follow):
svn: Working copy 'D:\wc\dirb' is missing or not locked
$ svn status
A dira
~ dirb
To me, that looks like a bug. Maybe someone else has another opinion ?
Thanks !
François
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Unable to commit after removing added folder
Posted by François Beausoleil <fb...@ftml.net>.
Philip Martin said the following on 2005-04-28 15:11:
> You need to get rid of the unversioned item that is obstructing dirb,
> then run "svn revert dirb" to revert the schedule add.
Oh great ! Now, why didn't I think of that :( Thanks for the info !
François
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Unable to commit after removing added folder
Posted by Philip Martin <ph...@codematters.co.uk>.
François Beausoleil <fb...@ftml.net> writes:
> $ svn commit
> svn: Commit failed (details follow):
> svn: Working copy 'D:\wc\dirb' is missing or not locked
>
> $ svn status
> A dira
> ~ dirb
>
> To me, that looks like a bug. Maybe someone else has another opinion ?
You need to get rid of the unversioned item that is obstructing dirb,
then run "svn revert dirb" to revert the schedule add.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org