##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r6100:49c69e1e default
r6385:0d4e068e default
Show More
test-convert-clonebranches.out
29 lines | 790 B | text/plain | TextLexer
/ tests / test-convert-clonebranches.out
Patrick Mezard
convert: hg.clonebranches must pull missing parents (issue941)
r5934 marked working directory as branch branch0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% convert
3 adda
2 addb
pulling from default into branch0
1 changesets found
1 changea
0 mergeab
pulling from default into branch0
1 changesets found
marked working directory as branch branch1
marked working directory as branch branch2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
marked working directory as branch branch3
% incremental conversion
Patrick Mezard
convert: fix --datesort ordering...
r6100 2 c2
pulling from branch0 into branch2
Patrick Mezard
convert: hg.clonebranches must pull missing parents (issue941)
r5934 2 changesets found
Patrick Mezard
convert: fix --datesort ordering...
r6100 1 c1
pulling from branch0 into branch1
Patrick Mezard
convert: hg.clonebranches must pull missing parents (issue941)
r5934 2 changesets found
0 c3
pulling from branch2 into branch3
3 changesets found
pulling from branch1 into branch3
1 changesets found