test-newbranch.out
180 lines
| 5.1 KiB
| text/plain
|
TextLexer
/ tests / test-newbranch.out
|
r4602 | marked working directory as branch foo | ||
|
r3502 | foo | ||
|
r4602 | marked working directory as branch bar | ||
|
r4203 | % branch shadowing | ||
|
r10596 | abort: a branch of the same name already exists (use 'hg update' to switch to it) | ||
|
r4602 | marked working directory as branch default | ||
|
r11317 | created new head | ||
|
r8959 | % there should be only one default branch head | ||
|
r12156 | changeset: 3:9d567d0b51f9 | ||
|
r8959 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r8959 | summary: clear branch name | ||
|
r3420 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
foo | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
foo | ||||
|
r12156 | changeset: 5:dc140083783b | ||
|
r3420 | branch: foo | ||
tag: tip | ||||
|
r12156 | parent: 4:98d14f698afe | ||
parent: 3:9d567d0b51f9 | ||||
|
r3420 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r3420 | summary: merge | ||
|
r12156 | changeset: 4:98d14f698afe | ||
|
r3420 | branch: foo | ||
|
r12156 | parent: 1:0079f24813e2 | ||
|
r3420 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r3420 | summary: modify a branch | ||
|
r12156 | changeset: 3:9d567d0b51f9 | ||
|
r3420 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r3420 | summary: clear branch name | ||
|
r12156 | changeset: 2:ed2bbf4e0102 | ||
|
r3420 | branch: bar | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r3420 | summary: change branch name | ||
|
r12156 | changeset: 1:0079f24813e2 | ||
|
r3420 | branch: foo | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r3420 | summary: add branch name | ||
|
r12156 | changeset: 0:db01e8ea3388 | ||
|
r3420 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r3420 | summary: initial | ||
|
r12156 | foo 5:dc140083783b | ||
default 3:9d567d0b51f9 (inactive) | ||||
bar 2:ed2bbf4e0102 (inactive) | ||||
|
r3502 | foo | ||
|
r4176 | default | ||
|
r3502 | bar | ||
|
r3451 | % test for invalid branch cache | ||
|
r11175 | rolling back to revision 4 (undo commit) | ||
|
r12156 | changeset: 4:98d14f698afe | ||
|
r3451 | branch: foo | ||
tag: tip | ||||
|
r12156 | parent: 1:0079f24813e2 | ||
|
r3451 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r3451 | summary: modify a branch | ||
|
r6056 | invalidating branch cache (tip differs) | ||
|
r12156 | changeset: 4:98d14f698afeaff8cb612dcf215ce95e639effc3 | ||
|
r3761 | branch: foo | ||
tag: tip | ||||
|
r12156 | parent: 1:0079f24813e2b73a891577c243684c5066347bc8 | ||
|
r3761 | parent: -1:0000000000000000000000000000000000000000 | ||
manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a | ||||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r3761 | files: a | ||
extra: branch=foo | ||||
description: | ||||
modify a branch | ||||
|
r12156 | 4:98d14f698afe | ||
98d14f698afeaff8cb612dcf215ce95e639effc3 4 | ||||
9d567d0b51f9e2068b054e1948e1a927f99b5874 default | ||||
98d14f698afeaff8cb612dcf215ce95e639effc3 foo | ||||
ed2bbf4e01029020711be82ca905283e883f0e11 bar | ||||
|
r5988 | % push should update the branch cache | ||
% pushing just rev 0 | ||||
|
r12156 | db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 0 | ||
db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 default | ||||
|
r5988 | % pushing everything | ||
|
r12156 | 98d14f698afeaff8cb612dcf215ce95e639effc3 4 | ||
9d567d0b51f9e2068b054e1948e1a927f99b5874 default | ||||
98d14f698afeaff8cb612dcf215ce95e639effc3 foo | ||||
ed2bbf4e01029020711be82ca905283e883f0e11 bar | ||||
|
r4175 | % update with no arguments: tipmost revision of the current branch | ||
|
r12156 | 9d567d0b51f9 | ||
98d14f698afe (foo) tip | ||||
|
r4602 | marked working directory as branch foobar | ||
|
r4231 | abort: branch foobar not found | ||
|
r4410 | % fastforward merge | ||
|
r4602 | marked working directory as branch ff | ||
|
r4410 | adding ff | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
foo | ||||
|
r12156 | changeset: 6:917eb54e1b4b | ||
|
r4410 | branch: foo | ||
tag: tip | ||||
|
r12156 | parent: 4:98d14f698afe | ||
parent: 5:6683a60370cb | ||||
|
r4410 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r4410 | summary: Merge ff into foo | ||
a | ||||
ff | ||||
|
r6723 | % test merging, add 3 default heads and one test head | ||
adding a | ||||
adding b | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
adding c | ||||
created new head | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
adding d | ||||
created new head | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
marked working directory as branch test | ||||
adding e | ||||
changeset: 4:3a1e01ed1df4 | ||||
branch: test | ||||
tag: tip | ||||
parent: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: e | ||||
changeset: 3:980f7dc84c29 | ||||
parent: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: d | ||||
changeset: 2:d36c0562f908 | ||||
parent: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: c | ||||
changeset: 1:d2ae7f538514 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: b | ||||
changeset: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
% implicit merge with test branch as parent | ||||
abort: branch 'test' has one head - please merge with an explicit rev | ||||
|
r10355 | (run 'hg heads' to see all heads) | ||
|
r6723 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
% implicit merge with default branch as parent | ||||
abort: branch 'default' has 3 heads - please merge with an explicit rev | ||||
|
r10355 | (run 'hg heads .' to see heads) | ||
|
r6723 | % 3 branch heads, explicit merge required | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
% 2 branch heads, implicit merge works | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||