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

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

Issue919: add a standard extension to recreate hardlinks between repositories....
Issue919: add a standard extension to recreate hardlinks between repositories. Having to run a standalone Python script from the contrib dir is a nuisance. Also makes various improvements to locking, file discovery, etc. Should also update: http://www.selenic.com/mercurial/wiki/index.cgi/RecreateHardlinksBetweenRepositories
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r9729:aa9ccab5 default
Show More
test-rename-after-merge.out
43 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-rename-after-merge.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318 % create source repository
adding a
% fork source repository
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
% update source repository
% merge repositories
pulling from ../t2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Matt Mackall
copy: simplify inner copy...
 r5608 M b
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318 % rename b as c
A c
R b
% rename back c as b
Matt Mackall
copy: simplify inner copy...
 r5608 M b
Patrick Mezard
Fix a corner case when committing a rename after a merge (issue1476)
 r7689 % test issue 1476
adding a
adding b1
adding b2
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
adding c1
adding c2
created new head
% merge heads
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% commit issue 1476
copies: c2 (c1)
rolling back last transaction
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
% merge heads again
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% commit issue 1476 with a rename on the other side
copies: b2 (b1)