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

error committing a deleted dir

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-03-18 22:50:19 CET

Hi,

As I found out, it's not possible to commit a deleted folder which had
another deleted folder in it non-recursively. I know this is probably
not a problem to most of you, but to me and TSVN it is a big one.
I'll try to explain:

imagine the following wc structure:
parent/child1/child2/file2
parent/child1/file1
parent/file3
parent/file4

now do

svn rm parent/child1
time /t >> parent/file3
time /t >> parent/file4
svn propset customprop customvalue parent

so the folder child1 and child2 are marked for deletion, and file3 and
file4 are modified. Also the parent folder is modified.

now I want to commit everything except parent/file3.

svn ci parent/child1 parent parent/file4 -N -m "some log message"
Deleting parent/child1
...
svn: Commit succeeded, but other errors follow:
svn: Error bumping revisions post-commit (details follow):
svn: Working copy "path/fo/wc child1/child2" not locked

after that, even an 'svn cleanup' fails, because there's a file named
KILLME inside the .svn folder in child2.

Sure, this is a very rare case for users of the command line client
because most of the time you're using the default recursive commit. But
TortoiseSVN does always non-recursive commits because it let's the user
select which changes to commit, and if a modified file is marked for not
committing then a recursive commit of the parent folder would still
commit that file.

I hope there's an easy fix for this, because TSVN depends on it. I don't
want to force the user to commit such deleted folders separately since
this would mean creating another revision.

Also, the function svn_client_commit() errors out if TSVN passes all the
paths to it (i.e. parent/child1, parent/child1/file1,
parent/child2/file2, parent/child2, ...). I can work around this, but
not around the case mentioned above.

Stefan

---
My opinions may have changed, but not the fact that I am right.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 18 22:51:28 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.