test-merge-default.out
36 lines
| 1.5 KiB
| text/plain
|
TextLexer
/ tests / test-merge-default.out
|
r2915 | adding a | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r6336 | created new head | ||
|
r2915 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6336 | created new head | ||
|
r2915 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% should fail because not at a head | ||||
|
r6723 | abort: branch 'default' has 3 heads - please merge with an explicit rev | ||
|
r10355 | (run 'hg heads .' to see heads) | ||
|
r2915 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% should fail because > 2 heads | ||||
|
r6723 | abort: branch 'default' has 3 heads - please merge with an explicit rev | ||
|
r10355 | (run 'hg heads .' to see heads) | ||
|
r2915 | % should succeed | ||
|
r10504 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r2915 | (branch merge, don't forget to commit) | ||
% should succeed - 2 heads | ||||
|
r10504 | changeset: 3:ea9ff125ff88 | ||
parent: 1:1846eede8b68 | ||||
|
r8387 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: d | ||||
|
r10504 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r2915 | (branch merge, don't forget to commit) | ||
|
r5242 | % should fail because at tip | ||
abort: there is nothing to merge | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r2915 | % should fail because 1 head | ||
abort: there is nothing to merge - use "hg update" instead | ||||
|
r10355 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
marked working directory as branch foobranch | ||||
created new head | ||||
% should fail because merge with other branch | ||||
abort: branch 'foobranch' has one head - please merge with an explicit rev | ||||
(run 'hg heads' to see all heads) | ||||