test-newbranch.out
117 lines
| 3.2 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 | ||
abort: a branch of the same name already exists (use --force to override) | ||||
|
r4602 | marked working directory as branch default | ||
|
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 | ||||
|
r3760 | changeset: 5:5f8fb06e083e | ||
|
r3420 | branch: foo | ||
tag: tip | ||||
|
r3760 | parent: 4:4909a3732169 | ||
parent: 3:bf1bc2f45e83 | ||||
|
r3420 | user: test | ||
|
r3760 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r3420 | summary: merge | ||
|
r3760 | changeset: 4:4909a3732169 | ||
|
r3420 | branch: foo | ||
|
r3760 | parent: 1:b699b1cec9c2 | ||
|
r3420 | user: test | ||
|
r3760 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r3420 | summary: modify a branch | ||
|
r3760 | changeset: 3:bf1bc2f45e83 | ||
|
r3420 | user: test | ||
|
r3760 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r3420 | summary: clear branch name | ||
|
r3760 | changeset: 2:67ec16bde7f1 | ||
|
r3420 | branch: bar | ||
user: test | ||||
|
r3760 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r3420 | summary: change branch name | ||
|
r3760 | changeset: 1:b699b1cec9c2 | ||
|
r3420 | branch: foo | ||
user: test | ||||
|
r3760 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r3420 | summary: add branch name | ||
|
r3760 | changeset: 0:be8523e69bf8 | ||
|
r3420 | user: test | ||
|
r3760 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r3420 | summary: initial | ||
|
r3760 | foo 5:5f8fb06e083e | ||
|
r4675 | default 3:bf1bc2f45e83 (inactive) | ||
bar 2:67ec16bde7f1 (inactive) | ||||
|
r3502 | foo | ||
|
r4176 | default | ||
|
r3502 | bar | ||
|
r3451 | % test for invalid branch cache | ||
rolling back last transaction | ||||
|
r3760 | changeset: 4:4909a3732169 | ||
|
r3451 | branch: foo | ||
tag: tip | ||||
|
r3760 | parent: 1:b699b1cec9c2 | ||
|
r3451 | user: test | ||
|
r3760 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r3451 | summary: modify a branch | ||
|
r6056 | invalidating branch cache (tip differs) | ||
|
r3761 | changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f | ||
branch: foo | ||||
tag: tip | ||||
parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31 | ||||
parent: -1:0000000000000000000000000000000000000000 | ||||
manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a | ||||
user: test | ||||
date: Mon Jan 12 13:46:40 1970 +0000 | ||||
files: a | ||||
extra: branch=foo | ||||
description: | ||||
modify a branch | ||||
4:4909a3732169 | ||||
4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 | ||||
|
r4176 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default | ||
|
r3761 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo | ||
67ec16bde7f1575d523313b9bca000f6a6f12dca bar | ||||
|
r5988 | % push should update the branch cache | ||
% pushing just rev 0 | ||||
be8523e69bf892e25817fc97187516b3c0804ae4 0 | ||||
be8523e69bf892e25817fc97187516b3c0804ae4 default | ||||
% pushing everything | ||||
4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 | ||||
bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default | ||||
4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo | ||||
67ec16bde7f1575d523313b9bca000f6a6f12dca bar | ||||
|
r4175 | % update with no arguments: tipmost revision of the current branch | ||
bf1bc2f45e83 | ||||
4909a3732169 (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 | ||||
|
r4623 | changeset: 6:f0c74f92a385 | ||
|
r4410 | branch: foo | ||
tag: tip | ||||
|
r4623 | parent: 4:4909a3732169 | ||
parent: 5:c420d2121b71 | ||||
|
r4410 | user: test | ||
date: Mon Jan 12 13:46:40 1970 +0000 | ||||
summary: Merge ff into foo | ||||
a | ||||
ff | ||||