##// 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:

r6100:49c69e1e default
r6651:7f0dd352 default
Show More
test-convert-clonebranches.out
29 lines | 790 B | text/plain | TextLexer
/ tests / test-convert-clonebranches.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
convert: hg.clonebranches must pull missing parents (issue941)
 r5934 marked working directory as branch branch0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% convert
3 adda
2 addb
pulling from default into branch0
1 changesets found
1 changea
0 mergeab
pulling from default into branch0
1 changesets found
marked working directory as branch branch1
marked working directory as branch branch2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
marked working directory as branch branch3
% incremental conversion
Patrick Mezard
convert: fix --datesort ordering...
 r6100 2 c2
pulling from branch0 into branch2
Patrick Mezard
convert: hg.clonebranches must pull missing parents (issue941)
 r5934 2 changesets found
Patrick Mezard
convert: fix --datesort ordering...
 r6100 1 c1
pulling from branch0 into branch1
Patrick Mezard
convert: hg.clonebranches must pull missing parents (issue941)
 r5934 2 changesets found
0 c3
pulling from branch2 into branch3
3 changesets found
pulling from branch1 into branch3
1 changesets found