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

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

Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension
Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension
Vadim Gelfer - - Load All Authors

File last commit:

r2915:013921c7 default
r4515:86a66cce default
Show More
test-merge-default.out
17 lines | 821 B | text/plain | TextLexer
/ tests / test-merge-default.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
merge with other head by default, not tip....
 r2915 adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because not at a head
abort: repo has 3 heads - please merge with an explicit rev
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because > 2 heads
abort: repo has 3 heads - please merge with an explicit rev
% should succeed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should succeed - 2 heads
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should fail because 1 head
abort: there is nothing to merge - use "hg update" instead