test-bheads.out
151 lines
| 3.5 KiB
| text/plain
|
TextLexer
/ tests / test-bheads.out
Alexis S. L. Carvalho
|
r6127 | 0: Adding root node | ||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 0: Adding root node | ||
Eric Hopper
|
r4648 | ======= | ||
marked working directory as branch a | ||||
Alexis S. L. Carvalho
|
r6127 | 1: Adding a branch | ||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 1: Adding a branch | ||
Eric Hopper
|
r4648 | ======= | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
marked working directory as branch b | ||||
Alexis S. L. Carvalho
|
r6127 | 2: Adding b branch | ||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 2: Adding b branch | ||
Eric Hopper
|
r4648 | ======= | ||
Alexis S. L. Carvalho
|
r6127 | 3: Adding b branch head 1 | ||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 3: Adding b branch head 1 | ||
Eric Hopper
|
r4648 | ======= | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 4: Adding b branch head 2 | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 4: Adding b branch head 2 | ||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ======= | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 5: Adding b branch head 3 | ||
4: Adding b branch head 2 | ||||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 5: Adding b branch head 3 | ||
4: Adding b branch head 2 | ||||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ======= | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
Alexis S. L. Carvalho
|
r6127 | 6: Merging b branch head 2 and b branch head 3 | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 6: Merging b branch head 2 and b branch head 3 | ||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ======= | ||
marked working directory as branch c | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
Eric Hopper
|
r4648 | ======= | ||
Brendan Cully
|
r4649 | no changes on branch c containing . are reachable from 3 | ||
Eric Hopper
|
r4648 | 1 | ||
------- | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
Eric Hopper
|
r4648 | 0 | ||
------- | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
0 | ||||
------- | ||||
Alexis S. L. Carvalho
|
r6127 | 3: Adding b branch head 1 | ||
Eric Hopper
|
r4648 | 0 | ||
------- | ||||
Alexis S. L. Carvalho
|
r6127 | 3: Adding b branch head 1 | ||
6: Merging b branch head 2 and b branch head 3 | ||||
Eric Hopper
|
r4648 | 0 | ||
------- | ||||
Brendan Cully
|
r4649 | no changes on branch b containing . are reachable from 7 | ||
Eric Hopper
|
r4648 | 1 | ||
======= | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 0: Adding root node | ||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 1: Adding a branch | ||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 6: Merging b branch head 2 and b branch head 3 | ||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 6: Merging b branch head 2 and b branch head 3 | ||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 6: Merging b branch head 2 and b branch head 3 | ||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 6: Merging b branch head 2 and b branch head 3 | ||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 6: Merging b branch head 2 and b branch head 3 | ||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ------- | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
3: Adding b branch head 1 | ||||
1: Adding a branch | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
Eric Hopper
|
r4648 | ------- | ||
======= | ||||
Alexis S. L. Carvalho
|
r6127 | 1: Adding a branch | ||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 6: Merging b branch head 2 and b branch head 3 | ||
3: Adding b branch head 1 | ||||
Eric Hopper
|
r4648 | ------- | ||
Alexis S. L. Carvalho
|
r6127 | 7: Adding c branch | ||
Eric Hopper
|
r4648 | ------- | ||
abort: unknown revision 'z'! | ||||
------- | ||||
======= | ||||
Alexis S. L. Carvalho
|
r6127 | 0: Adding root node | ||
1: Adding a branch | ||||
6: Merging b branch head 2 and b branch head 3 | ||||
3: Adding b branch head 1 | ||||
7: Adding c branch | ||||