Mercurial > hg

comparison tests/test-merge-default.out @ 10355:a5576908b589

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add hints about the use of 'hg heads' to find the rev to merge
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 07 Feb 2010 00:51:59 +0100
parents d8143769e1d4
children d2c1fc440533
comparison
equal deleted inserted replaced
10354:844d83da2da9 10355:a5576908b589
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 created new head 5 created new head
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7 % should fail because not at a head 7 % should fail because not at a head
8 abort: branch 'default' has 3 heads - please merge with an explicit rev 8 abort: branch 'default' has 3 heads - please merge with an explicit rev
9 (run 'hg heads .' to see heads)
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
10 % should fail because > 2 heads 11 % should fail because > 2 heads
11 abort: branch 'default' has 3 heads - please merge with an explicit rev 12 abort: branch 'default' has 3 heads - please merge with an explicit rev
13 (run 'hg heads .' to see heads)
12 % should succeed 14 % should succeed
13 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 15 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
14 (branch merge, don't forget to commit) 16 (branch merge, don't forget to commit)
15 % should succeed - 2 heads 17 % should succeed - 2 heads
16 changeset: 3:903c264cdf57 18 changeset: 3:903c264cdf57
24 % should fail because at tip 26 % should fail because at tip
25 abort: there is nothing to merge 27 abort: there is nothing to merge
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 % should fail because 1 head 29 % should fail because 1 head
28 abort: there is nothing to merge - use "hg update" instead 30 abort: there is nothing to merge - use "hg update" instead
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
32 marked working directory as branch foobranch
33 created new head
34 % should fail because merge with other branch
35 abort: branch 'foobranch' has one head - please merge with an explicit rev
36 (run 'hg heads' to see all heads)