Mercurial > hg
comparison tests/test-bisect2.out @ 6859:9369095779a1
add additional complex bisect tests (with non-linear history)
author | Bernhard Leiner <bleiner@gmail.com> |
---|---|
date | Sat, 02 Aug 2008 22:11:22 +0200 |
parents | |
children | 0491be4448bf |
comparison
equal
deleted
inserted
replaced
6858:8f256bf98219 | 6859:9369095779a1 |
---|---|
1 % init | |
2 % committing changes | |
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 created new head | |
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6 (branch merge, don't forget to commit) | |
7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
8 created new head | |
9 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
10 created new head | |
11 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 (branch merge, don't forget to commit) | |
13 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
14 created new head | |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
16 created new head | |
17 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
18 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
19 (branch merge, don't forget to commit) | |
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 created new head | |
22 % log | |
23 changeset: 18:d42e18c7bc9b | |
24 tag: tip | |
25 parent: 15:857b178a7cf3 | |
26 user: test | |
27 date: Thu Jan 01 00:00:18 1970 +0000 | |
28 summary: 18 | |
29 | |
30 changeset: 17:228c06deef46 | |
31 user: test | |
32 date: Thu Jan 01 00:00:17 1970 +0000 | |
33 summary: 17 | |
34 | |
35 changeset: 16:609d82a7ebae | |
36 user: test | |
37 date: Thu Jan 01 00:00:16 1970 +0000 | |
38 summary: 16 | |
39 | |
40 changeset: 15:857b178a7cf3 | |
41 parent: 13:b0a32c86eb31 | |
42 parent: 10:429fcd26f52d | |
43 user: test | |
44 date: Thu Jan 01 00:00:15 1970 +0000 | |
45 summary: merge 10,13 | |
46 | |
47 changeset: 14:faa450606157 | |
48 parent: 11:82ca6f06eccd | |
49 user: test | |
50 date: Thu Jan 01 00:00:14 1970 +0000 | |
51 summary: 14 | |
52 | |
53 changeset: 13:b0a32c86eb31 | |
54 user: test | |
55 date: Thu Jan 01 00:00:13 1970 +0000 | |
56 summary: 13 | |
57 | |
58 changeset: 12:9f259202bbe7 | |
59 user: test | |
60 date: Thu Jan 01 00:00:12 1970 +0000 | |
61 summary: 12 | |
62 | |
63 changeset: 11:82ca6f06eccd | |
64 parent: 8:dab8161ac8fc | |
65 user: test | |
66 date: Thu Jan 01 00:00:11 1970 +0000 | |
67 summary: 11 | |
68 | |
69 changeset: 10:429fcd26f52d | |
70 parent: 9:3c77083deb4a | |
71 parent: 6:a214d5d3811a | |
72 user: test | |
73 date: Thu Jan 01 00:00:10 1970 +0000 | |
74 summary: merge 6,9 | |
75 | |
76 changeset: 9:3c77083deb4a | |
77 user: test | |
78 date: Thu Jan 01 00:00:09 1970 +0000 | |
79 summary: 9 | |
80 | |
81 changeset: 8:dab8161ac8fc | |
82 parent: 1:4ca5088da217 | |
83 user: test | |
84 date: Thu Jan 01 00:00:08 1970 +0000 | |
85 summary: 8 | |
86 | |
87 changeset: 7:50c76098bbf2 | |
88 parent: 4:5c668c22234f | |
89 user: test | |
90 date: Thu Jan 01 00:00:07 1970 +0000 | |
91 summary: 7 | |
92 | |
93 changeset: 6:a214d5d3811a | |
94 parent: 5:385a529b6670 | |
95 parent: 4:5c668c22234f | |
96 user: test | |
97 date: Thu Jan 01 00:00:06 1970 +0000 | |
98 summary: merge 4,5 | |
99 | |
100 changeset: 5:385a529b6670 | |
101 parent: 2:051e12f87bf1 | |
102 user: test | |
103 date: Thu Jan 01 00:00:05 1970 +0000 | |
104 summary: 5 | |
105 | |
106 changeset: 4:5c668c22234f | |
107 user: test | |
108 date: Thu Jan 01 00:00:04 1970 +0000 | |
109 summary: 4 | |
110 | |
111 changeset: 3:0950834f0a9c | |
112 user: test | |
113 date: Thu Jan 01 00:00:03 1970 +0000 | |
114 summary: 3 | |
115 | |
116 changeset: 2:051e12f87bf1 | |
117 user: test | |
118 date: Thu Jan 01 00:00:02 1970 +0000 | |
119 summary: 2 | |
120 | |
121 changeset: 1:4ca5088da217 | |
122 user: test | |
123 date: Thu Jan 01 00:00:01 1970 +0000 | |
124 summary: 1 | |
125 | |
126 changeset: 0:33b1f9bc8bc5 | |
127 user: test | |
128 date: Thu Jan 01 00:00:00 1970 +0000 | |
129 summary: 0 | |
130 | |
131 % hg up -C | |
132 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
133 % complex bisect test 1 | |
134 Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests) | |
135 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
136 Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests) | |
137 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
138 Testing changeset 10:429fcd26f52d (9 changesets remaining, ~3 tests) | |
139 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
140 Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests) | |
141 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
142 Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests) | |
143 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
144 The first bad revision is: | |
145 changeset: 9:3c77083deb4a | |
146 user: test | |
147 date: Thu Jan 01 00:00:09 1970 +0000 | |
148 summary: 9 | |
149 | |
150 % complex bisect test 2 | |
151 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) | |
152 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
153 Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) | |
154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
155 Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests) | |
156 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
157 Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests) | |
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
159 The first good revision is: | |
160 changeset: 13:b0a32c86eb31 | |
161 user: test | |
162 date: Thu Jan 01 00:00:13 1970 +0000 | |
163 summary: 13 | |
164 | |
165 % complex bisect test 3 | |
166 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) | |
167 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
168 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) | |
169 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
170 Testing changeset 10:429fcd26f52d (8 changesets remaining, ~3 tests) | |
171 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
172 Testing changeset 12:9f259202bbe7 (8 changesets remaining, ~3 tests) | |
173 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
174 Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests) | |
175 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
176 Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests) | |
177 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
178 Due to skipped revisions, the first bad revision could be any of: | |
179 changeset: 9:3c77083deb4a | |
180 user: test | |
181 date: Thu Jan 01 00:00:09 1970 +0000 | |
182 summary: 9 | |
183 | |
184 changeset: 10:429fcd26f52d | |
185 parent: 9:3c77083deb4a | |
186 parent: 6:a214d5d3811a | |
187 user: test | |
188 date: Thu Jan 01 00:00:10 1970 +0000 | |
189 summary: merge 6,9 | |
190 | |
191 changeset: 13:b0a32c86eb31 | |
192 user: test | |
193 date: Thu Jan 01 00:00:13 1970 +0000 | |
194 summary: 13 | |
195 | |
196 changeset: 15:857b178a7cf3 | |
197 parent: 13:b0a32c86eb31 | |
198 parent: 10:429fcd26f52d | |
199 user: test | |
200 date: Thu Jan 01 00:00:15 1970 +0000 | |
201 summary: merge 10,13 | |
202 | |
203 % complex bisect test 4 | |
204 Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) | |
205 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
206 Testing changeset 13:b0a32c86eb31 (6 changesets remaining, ~2 tests) | |
207 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
208 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) | |
209 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
210 Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) | |
211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
212 Due to skipped revisions, the first good revision could be any of: | |
213 changeset: 15:857b178a7cf3 | |
214 parent: 13:b0a32c86eb31 | |
215 parent: 10:429fcd26f52d | |
216 user: test | |
217 date: Thu Jan 01 00:00:15 1970 +0000 | |
218 summary: merge 10,13 | |
219 | |
220 changeset: 16:609d82a7ebae | |
221 user: test | |
222 date: Thu Jan 01 00:00:16 1970 +0000 | |
223 summary: 16 | |
224 | |
225 changeset: 17:228c06deef46 | |
226 user: test | |
227 date: Thu Jan 01 00:00:17 1970 +0000 | |
228 summary: 17 | |
229 |