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

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

Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.
Matt Mackall - - Load All Authors

File last commit:

r5042:f191bc39 default
r5080:73fdc8bd default
Show More
test-merge9.out
21 lines | 587 B | text/plain | TextLexer
/ tests / test-merge9.out
History | Source | Raw |Copy content |Copy permalink
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
 r4682 adding bar
adding foo
adding quux1
adding quux2
merging bar
merging bar failed!
merging foo and baz
Matt Mackall
merge: do early copy to deal with issue636...
 r5042 merging baz failed!
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
 r4682 1 files updated, 0 files merged, 0 files removed, 2 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 2
hg merge 1
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging bar
merging bar failed!
merging baz and foo
merging baz failed!
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 1
hg merge 2