On Tue 2003-09-09 at 16:00:45 +0200, Joerg Hessdoerfer wrote:
[...]
> OK, so delete the file. Another go. 'Obstructed update' on next file. OK, so
> delete the entire tree in this directory and go again... I thought.
>
> But, what the... now I got:
> svn: Working copy not locked
> svn: directory not locked (Subsystems/JetterCom)
>
> And there I am, plain and out of luck. I can't get this 'resolved' or
> 'cleanup'ed, it still mumbles the same message.
>
> Interestingly, 'resolve' gives out the warning:
> svn: warning: directory not locked (Subsystems/JetterCom)
> but I already know this ;-)
For "svn resolved", that is expected. "svn resolved" is meant for
cleaning up, after you manually resolved a conflict reported by
Subversion. Although there is some kind of conflict, it was reported
as "Obstructed update" by Subversion.
[...]
> Is this an issue? Or already resolved? (I didn't find it...)
> BTW, I'm still using 0.25.0 (but we'll upgrade to 0.29.0 tonight, I promise).
"svn update" refetching missing local-dirs has been implemented around
0.27, I think. Anyhow, with 0.29.0 I get (copy&paste of your recipe):
$ svnadmin create /tmp/test_repo
$ svn co file:///tmp/test_repo test_wc
Checked out revision 0.
$ cd test_wc
$ mkdir a_dir
$ svn add a_dir
A a_dir
$ svn -m 'test' ci
Adding a_dir
Committed revision 1.
$ touch a_dir/a_file
$ svn add a_dir/a_file
A a_dir/a_file
$ svn -m 'test' ci
Adding a_dir/a_file
Transmitting file data .
Committed revision 2.
$ svn update -r1
D a_dir/a_file
Updated to revision 1.
$ touch a_dir/a_file
$ svn update
svn: Obstructed update
svn: failed to add file 'a_dir/a_file': object of the same name already exists
Exit 1
$ rm -rf a_dir
$ svn update
A a_dir
A a_dir/a_file
Updated to revision 2.
Which looks fine to me.
Bye,
Benjamin.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 9 16:36:35 2003