##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

addremove: correctly handle intermediate symlinks...
addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).
Patrick Mezard - - Load All Authors

File last commit:

r6546:075b2c9a default
r6651:7f0dd352 default
Show More
test-convert-svn-move.out
105 lines | 2.1 KiB | text/plain | TextLexer
/ tests / test-convert-svn-move.out
History | Annotation | Raw |Copy content |Copy permalink
% initial svn import
Adding projA/trunk
Adding projA/trunk/a
Adding projA/trunk/d1
Adding projA/trunk/d1/b
Adding projA/trunk/d1/c
Adding projA/trunk/d2
Adding projA/trunk/d2/d
Committed revision 1.
% update svn repository
A A/trunk
A A/trunk/a
A A/trunk/d1
A A/trunk/d1/b
A A/trunk/d1/c
A A/trunk/d2
A A/trunk/d2/d
Checked out revision 1.
Sending trunk/a
Sending trunk/d1/c
Transmitting file data ..
Committed revision 2.
Committed revision 3.
D trunk
A subproject
A subproject/a
A subproject/d1
A subproject/d1/b
A subproject/d1/c
A subproject/d2
A subproject/d2/d
Updated to revision 3.
A subproject/trunk
Adding subproject/trunk
Committed revision 4.
A subproject/branches
Adding subproject/branches
Committed revision 5.
Committed revision 6.
Committed revision 7.
A subproject/trunk/d1
A subproject/trunk/d1/b
A subproject/trunk/d1/c
A subproject/trunk/d2
A subproject/trunk/d2/d
D subproject/d1
D subproject/d2
Updated to revision 7.
D subproject/trunk/d2/d
D subproject/trunk/d2
Sending subproject/trunk/d1/b
Deleting subproject/trunk/d2
Transmitting file data .
Committed revision 8.
Committed revision 9.
% copy a file from a past revision
Committed revision 10.
% copy a directory from a past revision
Committed revision 11.
% convert trunk and branches
initializing destination A-hg repository
scanning source...
sorting...
converting...
9 createtrunk
8 moved1
7 moved1
6 moved2
5 changeb and rm d2
4 changeb and rm d2
3 moved1again
2 moved1again
1 copyfilefrompast
0 copydirfrompast
o 9 copydirfrompast files: d2/d
|
o 8 copyfilefrompast files: d
|
o 7 moved1again files: d1/b d1/c
|
| o 6 moved1again files:
| |
o | 5 changeb and rm d2 files: d1/b d2/d
| |
| o 4 changeb and rm d2 files: b
| |
o | 3 moved2 files: d2/d
| |
o | 2 moved1 files: d1/b d1/c
| |
| o 1 moved1 files: b c
|
o 0 createtrunk files:
default 9:
d1 6: