Mercurial > hg

comparison tests/test-bheads.out @ 10350:fd511e9eeea6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: do all branch heads by default, demote topological to -t/--topo
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 06 Feb 2010 19:38:39 +0100
parents e2db50cae6e6
children 5b48d819d5f9
comparison
equal deleted inserted replaced
10349:20356e69710c 10350:fd511e9eeea6
1 0: Adding root node 1 0: Adding root node ()
2 ------- 2 -------
3 0: Adding root node 3 0: Adding root node ()
4 ======= 4 =======
5 marked working directory as branch a 5 marked working directory as branch a
6 1: Adding a branch 6 1: Adding a branch (a)
7 0: Adding root node ()
7 ------- 8 -------
8 1: Adding a branch 9 1: Adding a branch (a)
9 ======= 10 =======
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11 marked working directory as branch b 12 marked working directory as branch b
12 created new head 13 created new head
13 2: Adding b branch 14 2: Adding b branch (b)
14 1: Adding a branch 15 1: Adding a branch (a)
16 0: Adding root node ()
15 ------- 17 -------
16 2: Adding b branch 18 2: Adding b branch (b)
17 ======= 19 =======
18 3: Adding b branch head 1 20 3: Adding b branch head 1 (b)
19 1: Adding a branch 21 1: Adding a branch (a)
22 0: Adding root node ()
20 ------- 23 -------
21 3: Adding b branch head 1 24 3: Adding b branch head 1 (b)
22 ======= 25 =======
23 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
24 created new head 27 created new head
25 4: Adding b branch head 2 28 4: Adding b branch head 2 (b)
26 3: Adding b branch head 1 29 3: Adding b branch head 1 (b)
27 1: Adding a branch 30 1: Adding a branch (a)
31 0: Adding root node ()
28 ------- 32 -------
29 4: Adding b branch head 2 33 4: Adding b branch head 2 (b)
30 3: Adding b branch head 1 34 3: Adding b branch head 1 (b)
31 ======= 35 =======
32 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 36 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
33 created new head 37 created new head
34 5: Adding b branch head 3 38 5: Adding b branch head 3 (b)
35 4: Adding b branch head 2 39 4: Adding b branch head 2 (b)
36 3: Adding b branch head 1 40 3: Adding b branch head 1 (b)
37 1: Adding a branch 41 1: Adding a branch (a)
42 0: Adding root node ()
38 ------- 43 -------
39 5: Adding b branch head 3 44 5: Adding b branch head 3 (b)
40 4: Adding b branch head 2 45 4: Adding b branch head 2 (b)
41 3: Adding b branch head 1 46 3: Adding b branch head 1 (b)
42 ======= 47 =======
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 (branch merge, don't forget to commit) 49 (branch merge, don't forget to commit)
45 6: Merging b branch head 2 and b branch head 3 50 6: Merging b branch head 2 and b branch head 3 (b)
46 3: Adding b branch head 1 51 3: Adding b branch head 1 (b)
47 1: Adding a branch 52 1: Adding a branch (a)
53 0: Adding root node ()
48 ------- 54 -------
49 6: Merging b branch head 2 and b branch head 3 55 6: Merging b branch head 2 and b branch head 3 (b)
50 3: Adding b branch head 1 56 3: Adding b branch head 1 (b)
51 ======= 57 =======
52 marked working directory as branch c 58 marked working directory as branch c
53 7: Adding c branch 59 7: Adding c branch (c)
54 3: Adding b branch head 1 60 6: Merging b branch head 2 and b branch head 3 (b)
55 1: Adding a branch 61 3: Adding b branch head 1 (b)
62 1: Adding a branch (a)
63 0: Adding root node ()
56 ------- 64 -------
57 7: Adding c branch 65 7: Adding c branch (c)
58 ======= 66 =======
59 no open branch heads found on branches c (started at 3) 67 no open branch heads found on branches c (started at 3)
60 1 68 1
61 ------- 69 -------
62 7: Adding c branch 70 7: Adding c branch (c)
63 0 71 0
64 ------- 72 -------
65 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 73 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
66 0 74 0
67 ------- 75 -------
68 3: Adding b branch head 1 76 3: Adding b branch head 1 (b)
69 0 77 0
70 ------- 78 -------
71 6: Merging b branch head 2 and b branch head 3 79 6: Merging b branch head 2 and b branch head 3 (b)
72 3: Adding b branch head 1 80 3: Adding b branch head 1 (b)
73 0 81 0
74 ------- 82 -------
75 no open branch heads found on branches b (started at 7) 83 no open branch heads found on branches b (started at 7)
76 1 84 1
77 ======= 85 =======
78 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 86 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
79 7: Adding c branch 87 7: Adding c branch (c)
80 3: Adding b branch head 1 88 6: Merging b branch head 2 and b branch head 3 (b)
81 1: Adding a branch 89 3: Adding b branch head 1 (b)
90 1: Adding a branch (a)
91 0: Adding root node ()
82 ------- 92 -------
83 0: Adding root node 93 0: Adding root node ()
84 ------- 94 -------
85 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
86 7: Adding c branch 96 7: Adding c branch (c)
87 3: Adding b branch head 1 97 6: Merging b branch head 2 and b branch head 3 (b)
88 1: Adding a branch 98 3: Adding b branch head 1 (b)
99 1: Adding a branch (a)
100 0: Adding root node ()
89 ------- 101 -------
90 1: Adding a branch 102 1: Adding a branch (a)
91 ------- 103 -------
92 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 104 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
93 7: Adding c branch 105 7: Adding c branch (c)
94 3: Adding b branch head 1 106 6: Merging b branch head 2 and b branch head 3 (b)
95 1: Adding a branch 107 3: Adding b branch head 1 (b)
108 1: Adding a branch (a)
109 0: Adding root node ()
96 ------- 110 -------
97 6: Merging b branch head 2 and b branch head 3 111 6: Merging b branch head 2 and b branch head 3 (b)
98 3: Adding b branch head 1 112 3: Adding b branch head 1 (b)
99 ------- 113 -------
100 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
101 7: Adding c branch 115 7: Adding c branch (c)
102 3: Adding b branch head 1 116 6: Merging b branch head 2 and b branch head 3 (b)
103 1: Adding a branch 117 3: Adding b branch head 1 (b)
118 1: Adding a branch (a)
119 0: Adding root node ()
104 ------- 120 -------
105 6: Merging b branch head 2 and b branch head 3 121 6: Merging b branch head 2 and b branch head 3 (b)
106 3: Adding b branch head 1 122 3: Adding b branch head 1 (b)
107 ------- 123 -------
108 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 124 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
109 7: Adding c branch 125 7: Adding c branch (c)
110 3: Adding b branch head 1 126 6: Merging b branch head 2 and b branch head 3 (b)
111 1: Adding a branch 127 3: Adding b branch head 1 (b)
128 1: Adding a branch (a)
129 0: Adding root node ()
112 ------- 130 -------
113 6: Merging b branch head 2 and b branch head 3 131 6: Merging b branch head 2 and b branch head 3 (b)
114 3: Adding b branch head 1 132 3: Adding b branch head 1 (b)
115 ------- 133 -------
116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 134 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
117 7: Adding c branch 135 7: Adding c branch (c)
118 3: Adding b branch head 1 136 6: Merging b branch head 2 and b branch head 3 (b)
119 1: Adding a branch 137 3: Adding b branch head 1 (b)
138 1: Adding a branch (a)
139 0: Adding root node ()
120 ------- 140 -------
121 6: Merging b branch head 2 and b branch head 3 141 6: Merging b branch head 2 and b branch head 3 (b)
122 3: Adding b branch head 1 142 3: Adding b branch head 1 (b)
123 ------- 143 -------
124 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
125 7: Adding c branch 145 7: Adding c branch (c)
126 3: Adding b branch head 1 146 6: Merging b branch head 2 and b branch head 3 (b)
127 1: Adding a branch 147 3: Adding b branch head 1 (b)
148 1: Adding a branch (a)
149 0: Adding root node ()
128 ------- 150 -------
129 6: Merging b branch head 2 and b branch head 3 151 6: Merging b branch head 2 and b branch head 3 (b)
130 3: Adding b branch head 1 152 3: Adding b branch head 1 (b)
131 ------- 153 -------
132 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
133 7: Adding c branch 155 7: Adding c branch (c)
134 3: Adding b branch head 1 156 6: Merging b branch head 2 and b branch head 3 (b)
135 1: Adding a branch 157 3: Adding b branch head 1 (b)
158 1: Adding a branch (a)
159 0: Adding root node ()
136 ------- 160 -------
137 7: Adding c branch 161 7: Adding c branch (c)
138 ------- 162 -------
139 ======= 163 =======
140 1: Adding a branch 164 1: Adding a branch (a)
141 ------- 165 -------
142 6: Merging b branch head 2 and b branch head 3 166 6: Merging b branch head 2 and b branch head 3 (b)
143 3: Adding b branch head 1 167 3: Adding b branch head 1 (b)
144 ------- 168 -------
145 7: Adding c branch 169 7: Adding c branch (c)
146 ------- 170 -------
147 abort: unknown revision 'z'! 171 abort: unknown revision 'z'!
148 ------- 172 -------
149 ======= 173 =======
150 7: Adding c branch 174 7: Adding c branch (c)
151 6: Merging b branch head 2 and b branch head 3 175 6: Merging b branch head 2 and b branch head 3 (b)
152 3: Adding b branch head 1 176 3: Adding b branch head 1 (b)
153 1: Adding a branch 177 1: Adding a branch (a)
154 0: Adding root node 178 0: Adding root node ()
179 % topological heads
180 7: Adding c branch (c)
181 3: Adding b branch head 1 (b)
182 1: Adding a branch (a)