Hi,
While building some testcases for my .Net wrapper library I found the
following on repeated merges:
When you move an already modified file with the new -g option you can't
move a file multiple times within one commit.
To me, this looks like a regression on the bugfix already implemented in
1.5 which allows multiple moves/renames of a file.
I really would like this feature to work in 1.5 as it makes integrating
scc in development environments a lot easier.
A reproduction recipe follows:
First: The behavior in svn 1.4.5 (Known issue on repeated merges which
was resolved in 1.5)
==============================
E:\tst>svn --version
svn, version 1.4.5 (r25188)
compiled Aug 22 2007, 20:49:04
E:\tst\wc>echo. > q
E:\tst\wc>svn add q
A q
E:\tst\wc>svn ci -m ""
Adding q
Transmitting file data .
Committed revision 1.
E:\tst\wc>svn mv q r
A r
D q
E:\tst\wc>svn mv r s
svn: Use --force to override this restriction
svn: Move will not be attempted unless forced
svn: 'r' has local modifications
E:\tst\wc>svn mv --force r s
svn: Cannot copy or move 'r': it's not in the repository yet; try
committing first
===============================
The next script is with a trunk build @ 26763 (Original issue fixed as
expected)
===============================
E:\tst\wc>svn-win32 --version
svn, version 1.5.0 (dev build)
compiled Sep 24 2007, 12:53:31
E:\tst\wc>echo. > q
E:\tst\wc>svn-win32 add q
A q
E:\tst\wc>svn-win32 ci -m ""
Adding q
Transmitting file data .
Committed revision 1.
E:\tst\wc>svn-win32 mv q r
A r
D q
E:\tst\wc>svn-win32 mv r s
A s
D r
(can move further many more times without errors)
==============================
But when I try the same with merge history I get the following error:
==============================
E:\tst\wc>svn-win32 --version
svn, version 1.5.0 (dev build)
compiled Sep 24 2007, 12:53:31
E:\tst\wc>echo. > q
E:\tst\wc>svn-win32 add q
E:\tst\wc>svn-win32 ci -m ""
Adding q
Transmitting file data .
Committed revision 1.
E:\tst\wc>svn-win32.exe mv -g q r
A r
D q
E:\tst\wc>\dev\sharpsvn\imports\release\bin\svn-win32.exe mv -g r s
A s
svn: File not found: revision 1, path '/r'
==============================
Bert Huijben
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 24 18:20:50 2007