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

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

keyword: remove "identify" and "remove" from nokwcommands...
keyword: remove "identify" and "remove" from nokwcommands These two commands care about the list of modified files returned by repo.status and we may need to do a full content comparison to populate that list.
Benoit Boissinot - - Load All Authors

File last commit:

r5242:9cd65787 default
r6157:09b00faa default
Show More
test-merge-default.out
20 lines | 952 B | text/plain | TextLexer
/ tests / test-merge-default.out
History | Annotation | Raw |Copy content |Copy permalink
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 at tip
abort: there is nothing to merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because 1 head
abort: there is nothing to merge - use "hg update" instead