author | Martin Geisler <mg@aragost.com> |
Fri, 13 Aug 2010 10:10:11 +0200 | |
branch | stable |
changeset 12048 | 11035185b619 |
parent 11543 | 0a2762d83c53 |
permissions | -rw-r--r-- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
1 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
2 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
3 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
4 |
======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
5 |
marked working directory as branch a |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
6 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
7 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
8 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
9 |
1: Adding a branch (a) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
10 |
======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
11 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
12 |
marked working directory as branch b |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
13 |
2: Adding b branch (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
14 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
15 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
16 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
17 |
2: Adding b branch (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
18 |
======= |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
19 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
20 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
21 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
22 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
23 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
24 |
======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
25 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6127
diff
changeset
|
26 |
created new head |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
27 |
4: Adding b branch head 2 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
28 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
29 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
30 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
31 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
32 |
4: Adding b branch head 2 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
33 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
34 |
======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
35 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6127
diff
changeset
|
36 |
created new head |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
37 |
5: Adding b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
38 |
4: Adding b branch head 2 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
39 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
40 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
41 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
42 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
43 |
5: Adding b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
44 |
4: Adding b branch head 2 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
45 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
46 |
======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
47 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
48 |
(branch merge, don't forget to commit) |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
49 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
50 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
51 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
52 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
53 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
54 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
55 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
56 |
======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
57 |
marked working directory as branch c |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
58 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
59 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
60 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
61 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
62 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
63 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
64 |
7: Adding c branch (c) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
65 |
======= |
10346
e2db50cae6e6
commands: don't do too much work for error messages
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10331
diff
changeset
|
66 |
no open branch heads found on branches c (started at 3) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
67 |
1 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
68 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
69 |
7: Adding c branch (c) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
70 |
0 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
71 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
72 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
73 |
0 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
74 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
75 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
76 |
0 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
77 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
78 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
79 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
80 |
0 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
81 |
------- |
10346
e2db50cae6e6
commands: don't do too much work for error messages
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10331
diff
changeset
|
82 |
no open branch heads found on branches b (started at 7) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
83 |
1 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
84 |
======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
85 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
86 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
87 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
88 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
89 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
90 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
91 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
92 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
93 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
94 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
95 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
96 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
97 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
98 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
99 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
100 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
101 |
1: Adding a branch (a) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
102 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
103 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
104 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
105 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
106 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
107 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
108 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
109 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
110 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
111 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
112 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
113 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
114 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
115 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
116 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
117 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
118 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
119 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
120 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
121 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
122 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
123 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
124 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
125 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
126 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
127 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
128 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
129 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
130 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
131 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
132 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
133 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
134 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
135 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
136 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
137 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
138 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
139 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
140 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
141 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
142 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
143 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
144 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
145 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
146 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
147 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
148 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
149 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
150 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
151 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
152 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
153 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
154 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
155 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
156 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
157 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
158 |
0: Adding root node () |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
159 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
160 |
7: Adding c branch (c) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
161 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
162 |
======= |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
163 |
1: Adding a branch (a) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
164 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
165 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
166 |
3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
167 |
------- |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
168 |
7: Adding c branch (c) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
169 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
170 |
abort: unknown revision 'z'! |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
171 |
------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
172 |
======= |
10350
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
173 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
174 |
6: Merging b branch head 2 and b branch head 3 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
175 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
176 |
1: Adding a branch (a) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
177 |
0: Adding root node () |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
178 |
% topological heads |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
179 |
7: Adding c branch (c) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
180 |
3: Adding b branch head 1 (b) |
fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
10346
diff
changeset
|
181 |
1: Adding a branch (a) |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
182 |
______________ |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
183 |
% created new head message |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
184 |
% init: no msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
185 |
adding a |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
186 |
marked working directory as branch b |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
187 |
adding b |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
188 |
% case NN: msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
189 |
marked working directory as branch b |
11543
0a2762d83c53
test-bheads: use a case-insensitive set of filenames (issue2274)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11318
diff
changeset
|
190 |
adding bb |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
191 |
created new head |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
192 |
% case HN: no msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
193 |
% case BN: msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
194 |
marked working directory as branch default |
11543
0a2762d83c53
test-bheads: use a case-insensitive set of filenames (issue2274)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11318
diff
changeset
|
195 |
adding aa |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
196 |
created new head |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
197 |
% case CN: msg |
11543
0a2762d83c53
test-bheads: use a case-insensitive set of filenames (issue2274)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11318
diff
changeset
|
198 |
adding bbb |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
199 |
created new head |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
200 |
% case BB: msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
201 |
marked working directory as branch default |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
202 |
created new head |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
203 |
% case CB: msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
204 |
created new head |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
205 |
% case HB: no msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
206 |
% case CC: msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
207 |
created new head |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
208 |
% case CH: no msg |
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
11173
diff
changeset
|
209 |
% case HH: no msg |