annotate tests/test-bheads.t @ 12298:f254204d8b8d

tests: unify test-rename-merge1
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 14 Sep 2010 13:43:05 +0200
parents 010025717202
children 4134686b83e1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
1 $ heads()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
2 > {
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
3 > hg heads --template '{rev}: {desc|firstline|strip} ({branches})\n' "$@"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
4 > }
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
5
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
6 $ hg init a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
7 $ cd a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
8 $ echo 'root' >root
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
9 $ hg add root
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
10 $ hg commit -m "Adding root node"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
11 $ heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
12 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
13 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
14 $ heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
15 0: Adding root node ()
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
16
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
17 =======
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
18
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
19 $ echo 'a' >a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
20 $ hg add a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
21 $ hg branch a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
22 marked working directory as branch a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
23 $ hg commit -m "Adding a branch"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
24 $ heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
25 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
26 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
27 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
28 $ heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
29 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
30
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
31 =======
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
32
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
33 $ hg update -C 0
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
34 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
35 $ echo 'b' >b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
36 $ hg add b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
37 $ hg branch b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
38 marked working directory as branch b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
39 $ hg commit -m "Adding b branch"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
40 $ heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
41 2: Adding b branch (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
42 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
43 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
44 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
45 $ heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
46 2: Adding b branch (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
47
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
48 =======
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
49
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
50 $ echo 'bh1' >bh1
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
51 $ hg add bh1
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
52 $ hg commit -m "Adding b branch head 1"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
53 $ heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
54 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
55 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
56 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
57 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
58 $ heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
59 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
60
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
61 =======
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
62
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
63 $ hg update -C 2
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
64 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
65 $ echo 'bh2' >bh2
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
66 $ hg add bh2
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
67 $ hg commit -m "Adding b branch head 2"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
68 created new head
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
69 $ heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
70 4: Adding b branch head 2 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
71 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
72 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
73 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
74 $ heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
75 4: Adding b branch head 2 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
76 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
77
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
78 =======
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
79
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
80 $ hg update -C 2
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
82 $ echo 'bh3' >bh3
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
83 $ hg add bh3
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
84 $ hg commit -m "Adding b branch head 3"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
85 created new head
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
86 $ heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
87 5: Adding b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
88 4: Adding b branch head 2 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
89 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
90 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
91 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
92 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
93 $ heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
94 5: Adding b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
95 4: Adding b branch head 2 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
96 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
97
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
98 =======
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
99
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
100 $ hg merge 4
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
102 (branch merge, don't forget to commit)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
103 $ hg commit -m "Merging b branch head 2 and b branch head 3"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
104 $ heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
105 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
106 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
107 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
108 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
109 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
110 $ heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
111 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
112 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
113
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
114 =======
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
115
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
116 $ echo 'c' >c
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
117 $ hg add c
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
118 $ hg branch c
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
119 marked working directory as branch c
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
120 $ hg commit -m "Adding c branch"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
121 $ heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
122 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
123 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
124 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
125 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
126 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
127 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
128 $ heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
129 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
130
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
131 =======
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
132
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
133 $ heads -r 3 .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
134 no open branch heads found on branches c (started at 3)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
135 $ echo $?
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
136 0
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
137 $ heads -r 2 .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
138 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
139 $ echo $?
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
140 0
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
141 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
142 $ hg update -C 4
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
143 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
144 $ echo $?
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
145 0
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
146 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
147 $ heads -r 3 .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
148 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
149 $ echo $?
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
150 0
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
151 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
152 $ heads -r 2 .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
153 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
154 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
155 $ echo $?
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
156 0
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
157 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
158 $ heads -r 7 .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
159 no open branch heads found on branches b (started at 7)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
160 $ echo $?
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
161 0
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
162
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
163 =======
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
164
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
165 $ for i in 0 1 2 3 4 5 6 7; do
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
166 > hg update -C "$i"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
167 > heads
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
168 > echo '-------'
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
169 > heads .
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
170 > echo '-------'
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
171 > done
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
172 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
173 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
174 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
175 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
176 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
177 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
178 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
179 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
180 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
181 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
182 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
183 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
184 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
185 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
186 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
187 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
188 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
189 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
190 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
191 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
192 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
193 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
194 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
195 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
196 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
197 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
198 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
199 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
201 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
202 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
203 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
204 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
205 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
206 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
207 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
208 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
209 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
210 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
211 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
212 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
213 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
214 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
215 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
216 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
217 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
218 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
219 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
220 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
221 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
222 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
223 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
224 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
225 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
226 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
227 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
228 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
229 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
230 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
231 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
232 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
233 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
234 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
235 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
236 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
237 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
238 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
239 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
241 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
242 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
243 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
244 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
245 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
246 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
247 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
248 -------
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
249
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
250 =======
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
251
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
252 $ for i in a b c z; do
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
253 > heads "$i"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
254 > echo '-------'
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
255 > done
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
256 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
257 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
258 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
259 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
260 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
261 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
262 -------
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
263 abort: unknown revision 'z'!
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
264 -------
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
265
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
266 =======
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
267
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
268 $ heads 0 1 2 3 4 5 6 7
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
269 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
270 6: Merging b branch head 2 and b branch head 3 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
271 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
272 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
273 0: Adding root node ()
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
274
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
275 Topological heads:
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
276
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
277 $ heads -t
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
278 7: Adding c branch (c)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
279 3: Adding b branch head 1 (b)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
280 1: Adding a branch (a)
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
281
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
282 $ cd ..
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
283 ______________
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
284
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
285 "created new head" message tests
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
286
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
287 $ hg init newheadmsg
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
288 $ cd newheadmsg
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
289
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
290 Init: no msg
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
291
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
292 $ echo 1 > a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
293 $ hg ci -Am "a0: Initial root"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
294 adding a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
295 $ echo 2 >> a
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
296 $ hg ci -m "a1 (HN)"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
297
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
298 $ hg branch b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
299 marked working directory as branch b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
300 $ echo 1 > b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
301 $ hg ci -Am "b2: Initial root for branch b"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
302 adding b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
303 $ echo 2 >> b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
304 $ hg ci -m "b3 (HN)"
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
305
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
306 Case NN: msg
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
307
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
308 $ hg up -q null
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
309 $ hg branch -f b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
310 marked working directory as branch b
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
311 $ echo 1 > bb
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
312 $ hg ci -Am "b4 (NN): new topo root for branch b"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
313 adding bb
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
314 created new head
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
315
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
316 Case HN: no msg
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
317
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
318 $ echo 2 >> bb
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
319 $ hg ci -m "b5 (HN)"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
320
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
321 Case BN: msg
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
322
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
323 $ hg branch -f default
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
324 marked working directory as branch default
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
325 $ echo 1 > aa
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
326 $ hg ci -Am "a6 (BN): new branch root"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
327 adding aa
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
328 created new head
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
329
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
330 Case CN: msg
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
331
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
332 $ hg up -q 4
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
333 $ echo 3 >> bbb
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
334 $ hg ci -Am "b7 (CN): regular new head"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
335 adding bbb
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
336 created new head
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
337
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
338 Case BB: msg
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
339
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
340 $ hg up -q 4
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
341 $ hg merge -q 3
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
342 $ hg branch -f default
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
343 marked working directory as branch default
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
344 $ hg ci -m "a8 (BB): weird new branch root"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
345 created new head
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
346
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
347 Case CB: msg
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
348
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
349 $ hg up -q 4
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
350 $ hg merge -q 1
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
351 $ hg ci -m "b9 (CB): new head from branch merge"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
352 created new head
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
353
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
354 Case HB: no msg
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
355
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
356 $ hg up -q 7
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
357 $ hg merge -q 6
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
358 $ hg ci -m "b10 (HB): continuing head from branch merge"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
359
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
360 Case CC: msg
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
361
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
362 $ hg up -q 4
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
363 $ hg merge -q 2
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
364 $ hg ci -m "b11 (CC): new head from merge"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
365 created new head
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
366
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
367 Case CH: no msg
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
368
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
369 $ hg up -q 2
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
370 $ hg merge -q 10
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
371 $ hg ci -m "b12 (CH): continuing head from merge"
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
372
12072
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
373 Case HH: no msg
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
374
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
375 $ hg merge -q 3
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
376 $ hg ci -m "b12 (HH): merging two heads"
010025717202 tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents: 11543
diff changeset
377