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

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

add a fix for issue 1175...
add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r6875:0d714a48 default
Show More
test-rename-after-merge.out
23 lines | 578 B | 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
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