##// END OF EJS Templates
Document log date ranges and mention 'hg help dates' for all commands (issue998)
Document log date ranges and mention 'hg help dates' for all commands (issue998)

File last commit:

r5608:784eadab default
r6163:1f733c2f default
Show More
test-rename-after-merge.out
22 lines | 551 B | text/plain | TextLexer
/ tests / test-rename-after-merge.out
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
r5318 % create source repository
adding a
% fork source repository
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