Commit of renamed file in renamed directory breaks working copy

View: New views
1 Messages — Rating Filter:   Alert me  

Commit of renamed file in renamed directory breaks working copy

by Arfrever Frehtes Taifersar Arahesis-2 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

I'm attaching the script which shows that the commit of renamed file in
renamed directory breaks working copy. Additionally the rename is committed
incorrectly, which is shown in the second working copy.
I use Subversion trunk r40328. The output of this script:

+ rm -fr repo wc wc2
+ svnadmin create repo
++ pwd
+ svn co file:///tmp/repo wc
Checked out revision 0.
+ pushd wc
+ mkdir dir1
+ echo text1
+ svn add dir1
A         dir1
A         dir1/file1
+ svn ci -m ''
Adding         dir1
Adding         dir1/file1
Transmitting file data .
Committed revision 1.
+ svn up
At revision 1.
+ svn mv dir1 dir2
A         dir2
D         dir1/file1
D         dir1
+ svn mv dir2/file1 dir2/file2
A         dir2/file2
D         dir2/file1
+ svn ci -m ''
Deleting       dir1
Adding         dir2
Deleting       dir2/file1
Adding         dir2/file2
subversion/svn/commit-cmd.c:142: (apr_err=200000)
subversion/libsvn_client/commit.c:861: (apr_err=200000)
svn: Commit succeeded, but other errors follow:
subversion/libsvn_client/commit.c:879: (apr_err=155010)
svn: Error bumping revisions post-commit (details follow):
subversion/libsvn_wc/adm_ops.c:769: (apr_err=155010)
subversion/libsvn_wc/workqueue.c:1692: (apr_err=155010)
subversion/libsvn_wc/workqueue.c:926: (apr_err=155010)
subversion/libsvn_wc/wc_db.c:4303: (apr_err=155010)
subversion/libsvn_wc/wc_db.c:588: (apr_err=155010)
svn: The node 'file1' was not found.
+ svn st
subversion/svn/status-cmd.c:255: (apr_err=155037)
subversion/svn/util.c:960: (apr_err=155037)
subversion/libsvn_client/status.c:491: (apr_err=155037)
subversion/libsvn_wc/status.c:2273: (apr_err=155037)
subversion/libsvn_wc/status.c:975: (apr_err=155037)
subversion/libsvn_wc/entries.c:1240: (apr_err=155037)
subversion/libsvn_wc/entries.c:592: (apr_err=155037)
subversion/libsvn_wc/entries.c:592: (apr_err=155037)
subversion/libsvn_wc/wc_db.c:3178: (apr_err=155037)
subversion/libsvn_wc/wc_db.c:1046: (apr_err=155037)
subversion/libsvn_wc/wc_db.c:434: (apr_err=155037)
subversion/libsvn_wc/wc_db.c:334: (apr_err=155037)
svn: Previous operation was interrupted; run 'svn cleanup'
+ svn cleanup
subversion/svn/cleanup-cmd.c:67: (apr_err=155010)
subversion/libsvn_client/cleanup.c:55: (apr_err=155010)
subversion/libsvn_wc/log.c:1451: (apr_err=155010)
subversion/libsvn_wc/log.c:1412: (apr_err=155010)
subversion/libsvn_wc/log.c:1388: (apr_err=155010)
subversion/libsvn_wc/workqueue.c:1692: (apr_err=155010)
subversion/libsvn_wc/workqueue.c:926: (apr_err=155010)
subversion/libsvn_wc/wc_db.c:4303: (apr_err=155010)
subversion/libsvn_wc/wc_db.c:588: (apr_err=155010)
svn: The node 'file1' was not found.
+ popd
++ pwd
+ svn co file:///tmp/repo wc2
A    wc2/dir2
A    wc2/dir2/file2
A    wc2/dir2/file2/file1
Checked out revision 2.
+ tree wc
wc
`-- dir2
    `-- file2

1 directory, 1 file
+ tree wc2
wc2
`-- dir2
    `-- file2
        `-- file1

2 directories, 1 file


--
Arfrever Frehtes Taifersar Arahesis



subversion-commit_breaking_wc.sh (543 bytes) Download Attachment
signature.asc (205 bytes) Download Attachment