test-bheads.out
182 lines
| 4.8 KiB
| text/plain
|
TextLexer
/ tests / test-bheads.out
Dirkjan Ochtman
|
r10350 | 0: Adding root node () | ||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 0: Adding root node () | ||
Eric Hopper
|
r4648 | ======= | ||
marked working directory as branch a | ||||
Dirkjan Ochtman
|
r10350 | 1: Adding a branch (a) | ||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 1: Adding a branch (a) | ||
Eric Hopper
|
r4648 | ======= | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
marked working directory as branch b | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Dirkjan Ochtman
|
r10350 | 2: Adding b branch (b) | ||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 2: Adding b branch (b) | ||
Eric Hopper
|
r4648 | ======= | ||
Dirkjan Ochtman
|
r10350 | 3: Adding b branch head 1 (b) | ||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 3: Adding b branch head 1 (b) | ||
Eric Hopper
|
r4648 | ======= | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Dirkjan Ochtman
|
r10350 | 4: Adding b branch head 2 (b) | ||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 4: Adding b branch head 2 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ======= | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Dirkjan Ochtman
|
r10350 | 5: Adding b branch head 3 (b) | ||
4: Adding b branch head 2 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 5: Adding b branch head 3 (b) | ||
4: Adding b branch head 2 (b) | ||||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ======= | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ======= | ||
marked working directory as branch c | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
Eric Hopper
|
r4648 | ======= | ||
Dirkjan Ochtman
|
r10346 | no open branch heads found on branches c (started at 3) | ||
Eric Hopper
|
r4648 | 1 | ||
------- | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
Eric Hopper
|
r4648 | 0 | ||
------- | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
0 | ||||
------- | ||||
Dirkjan Ochtman
|
r10350 | 3: Adding b branch head 1 (b) | ||
Eric Hopper
|
r4648 | 0 | ||
------- | ||||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | 0 | ||
------- | ||||
Dirkjan Ochtman
|
r10346 | no open branch heads found on branches b (started at 7) | ||
Eric Hopper
|
r4648 | 1 | ||
======= | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 0: Adding root node () | ||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 1: Adding a branch (a) | ||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
Eric Hopper
|
r4648 | ------- | ||
======= | ||||
Dirkjan Ochtman
|
r10350 | 1: Adding a branch (a) | ||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 6: Merging b branch head 2 and b branch head 3 (b) | ||
3: Adding b branch head 1 (b) | ||||
Eric Hopper
|
r4648 | ------- | ||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
Eric Hopper
|
r4648 | ------- | ||
abort: unknown revision 'z'! | ||||
------- | ||||
======= | ||||
Dirkjan Ochtman
|
r10350 | 7: Adding c branch (c) | ||
6: Merging b branch head 2 and b branch head 3 (b) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||
0: Adding root node () | ||||
% topological heads | ||||
7: Adding c branch (c) | ||||
3: Adding b branch head 1 (b) | ||||
1: Adding a branch (a) | ||||