test-merge-default.out
28 lines
| 1.1 KiB
| text/plain
|
TextLexer
/ tests / test-merge-default.out
Vadim Gelfer
|
r2915 | adding a | ||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
|
Vadim Gelfer
|
r2915 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Dirkjan Ochtman
|
r6336 | created new head | ||
|
Vadim Gelfer
|
r2915 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| % should fail because not at a head | ||||
|
Dirkjan Ochtman
|
r6723 | abort: branch 'default' has 3 heads - please merge with an explicit rev | ||
|
Vadim Gelfer
|
r2915 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| % should fail because > 2 heads | ||||
|
Dirkjan Ochtman
|
r6723 | abort: branch 'default' has 3 heads - please merge with an explicit rev | ||
|
Vadim Gelfer
|
r2915 | % 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 | ||||
|
Dirkjan Ochtman
|
r8387 | changeset: 3:903c264cdf57 | ||
| parent: 1:ba677d0156c1 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: d | ||||
|
Vadim Gelfer
|
r2915 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||
Benoit Boissinot
|
r5242 | % should fail because at tip | ||
| abort: there is nothing to merge | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
Vadim Gelfer
|
r2915 | % should fail because 1 head | ||
| abort: there is nothing to merge - use "hg update" instead | ||||