Mercurial > hg

comparison tests/test-merge-default.out @ 8387:50b6af595e0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add -S/--show option to review revisions without merging
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 14 May 2009 16:03:17 +0200
parents 1fe6f365df2e
children d8143769e1d4
comparison
equal deleted inserted replaced
8386:4aad982111b6 8387:50b6af595e0c
11 abort: branch 'default' has 3 heads - please merge with an explicit rev 11 abort: branch 'default' has 3 heads - please merge with an explicit rev
12 % should succeed 12 % should succeed
13 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 13 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
14 (branch merge, don't forget to commit) 14 (branch merge, don't forget to commit)
15 % should succeed - 2 heads 15 % should succeed - 2 heads
16 changeset: 1:ba677d0156c1
17 user: test
18 date: Thu Jan 01 00:00:00 1970 +0000
19 summary: b
20
21 changeset: 3:903c264cdf57
22 parent: 1:ba677d0156c1
23 user: test
24 date: Thu Jan 01 00:00:00 1970 +0000
25 summary: d
26
16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 27 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17 (branch merge, don't forget to commit) 28 (branch merge, don't forget to commit)
18 % should fail because at tip 29 % should fail because at tip
19 abort: there is nothing to merge 30 abort: there is nothing to merge
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved