##// END OF EJS Templates
Fix for Issue1260
Fix for Issue1260

File last commit:

r6338:0750f111 default
r6988:907e4e9b default
Show More
test-rename-after-merge.out
23 lines | 578 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
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
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