Paul Maier wrote on Wed, Oct 20, 2010 at 23:03:56 +0200:
> Hello!
>
> I would be interested, if this problem is fixed in the
> current 1.7 trunk.
It's not fixed, see transcript below.
Could you please file an issue in our tracker, linking to this thread?
(You'll have to create a tigris.org account for that.)
Thanks,
Daniel
> svn cleanup should be able to repair and unlock the WC.
> Unfortunately I am not able to build the trunk from source
> myself.
>
> Here is a reproduction script that produces a corrupt WC, and no
> svn command can repair it, so the WC seems lost:
>
> svnadmin create xx
> svn co "file:///C:/[...]/xx" yy
> cd yy
> echo a > a
> svn add a
> svn ci -m ""
> svn lock a
> svn mkdir 1
> mv a 1 # here "forgot" to type svn before the mv
> svn ci -m ""
> svn st -u
> svn cleanup 1
> svn cleanup .
> svn st -u
>
> The error message advises to use svn cleanup, but svn cleanup
> fails to unlock the WC.
> (Even though it would be possible:
> touch a;
> svn cleanup .
> unlocks the WC.)
[[[
0:% cat foo.sh
#!/bin/sh
$svnadmin create xx
$svn co file:///`pwd`/xx yy
cd yy
echo a > a
$svn add a
$svn ci -m ""
$svn lock a
$svn mkdir 1
mv a 1 # here "forgot" to type $svn before the mv
$svn ci -m ""
$svn st -u
$svn cleanup 1
$svn cleanup .
$svn st -u
touch a;
$svn cleanup .
0:% sh -x ./foo.sh
+ /home/daniel/src/svn/trunk/subversion/svnadmin/svnadmin create xx
++ pwd
+ /home/daniel/src/svn/trunk/subversion/svn/svn co file:////tmp/svn/xx yy
Checked out revision 0.
+ cd yy
+ echo a
+ /home/daniel/src/svn/trunk/subversion/svn/svn add a
A a
+ /home/daniel/src/svn/trunk/subversion/svn/svn ci -m ''
Adding a
Transmitting file data .
Committed revision 1.
+ /home/daniel/src/svn/trunk/subversion/svn/svn lock a
'a' locked by user 'daniel'.
+ /home/daniel/src/svn/trunk/subversion/svn/svn mkdir 1
A 1
+ mv a 1
+ /home/daniel/src/svn/trunk/subversion/svn/svn ci -m ''
Adding 1
Committed revision 2.
subversion/svn/commit-cmd.c:156: (apr_err=200000)
subversion/libsvn_client/commit.c:855: (apr_err=200000)
svn: Commit succeeded, but other errors follow:
subversion/libsvn_client/commit.c:873: (apr_err=155009)
svn: Error bumping revisions post-commit (details follow):
subversion/libsvn_wc/adm_ops.c:510: (apr_err=155009)
subversion/libsvn_wc/workqueue.c:2282: (apr_err=155009)
subversion/libsvn_wc/workqueue.c:2217: (apr_err=155009)
subversion/libsvn_wc/workqueue.c:1311: (apr_err=155009)
svn: Error processing post-commit work for '/tmp/svn/yy/a'
subversion/libsvn_wc/workqueue.c:1134: (apr_err=2)
subversion/libsvn_wc/workqueue.c:880: (apr_err=2)
subversion/libsvn_subr/io.c:3630: (apr_err=2)
subversion/libsvn_subr/io.c:3561: (apr_err=2)
subversion/libsvn_subr/io.c:2764: (apr_err=2)
svn: Can't open file '/tmp/svn/yy/a': No such file or directory
+ /home/daniel/src/svn/trunk/subversion/svn/svn st -u
subversion/svn/status-cmd.c:326: (apr_err=155037)
subversion/svn/util.c:959: (apr_err=155037)
subversion/libsvn_client/status.c:300: (apr_err=155037)
subversion/libsvn_wc/node.c:193: (apr_err=155037)
subversion/libsvn_wc/wc_db.c:4350: (apr_err=155037)
subversion/libsvn_wc/wc_db_pdh.c:540: (apr_err=155037)
subversion/libsvn_wc/wc_db_pdh.c:268: (apr_err=155037)
subversion/libsvn_wc/wc_db_pdh.c:101: (apr_err=155037)
svn: Previous operation was interrupted; run 'svn cleanup'
+ /home/daniel/src/svn/trunk/subversion/svn/svn cleanup 1
subversion/svn/cleanup-cmd.c:82: (apr_err=155004)
subversion/libsvn_client/cleanup.c:64: (apr_err=155004)
subversion/libsvn_wc/cleanup.c:149: (apr_err=155004)
subversion/libsvn_wc/cleanup.c:92: (apr_err=155004)
subversion/libsvn_wc/wc_db.c:7409: (apr_err=155004)
subversion/libsvn_wc/wc_db.c:7409: (apr_err=155004)
svn: Working copy '/tmp/svn/yy/1' locked.
subversion/libsvn_wc/wc_db.c:7401: (apr_err=155004)
svn: '/tmp/svn/yy' is already locked.
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
+ /home/daniel/src/svn/trunk/subversion/svn/svn cleanup .
subversion/svn/cleanup-cmd.c:82: (apr_err=155009)
subversion/libsvn_client/cleanup.c:64: (apr_err=155009)
subversion/libsvn_wc/cleanup.c:149: (apr_err=155009)
subversion/libsvn_wc/cleanup.c:98: (apr_err=155009)
subversion/libsvn_wc/workqueue.c:2282: (apr_err=155009)
subversion/libsvn_wc/workqueue.c:2217: (apr_err=155009)
subversion/libsvn_wc/workqueue.c:1311: (apr_err=155009)
svn: Error processing post-commit work for '/tmp/svn/yy/a'
subversion/libsvn_wc/workqueue.c:1134: (apr_err=2)
subversion/libsvn_wc/workqueue.c:880: (apr_err=2)
subversion/libsvn_subr/io.c:3630: (apr_err=2)
subversion/libsvn_subr/io.c:3561: (apr_err=2)
subversion/libsvn_subr/io.c:2764: (apr_err=2)
svn: Can't open file '/tmp/svn/yy/a': No such file or directory
+ /home/daniel/src/svn/trunk/subversion/svn/svn st -u
subversion/svn/status-cmd.c:326: (apr_err=155037)
subversion/svn/util.c:959: (apr_err=155037)
subversion/libsvn_client/status.c:300: (apr_err=155037)
subversion/libsvn_wc/node.c:193: (apr_err=155037)
subversion/libsvn_wc/wc_db.c:4350: (apr_err=155037)
subversion/libsvn_wc/wc_db_pdh.c:540: (apr_err=155037)
subversion/libsvn_wc/wc_db_pdh.c:268: (apr_err=155037)
subversion/libsvn_wc/wc_db_pdh.c:101: (apr_err=155037)
svn: Previous operation was interrupted; run 'svn cleanup'
+ touch a
+ /home/daniel/src/svn/trunk/subversion/svn/svn cleanup .
0:%
]]]
Received on 2010-10-21 15:50:59 CEST