Show More
@@ -1107,9 +1107,8 b' def bisect(' | |||
|
1107 | 1107 | transition = b"bad" |
|
1108 | 1108 | state[transition].append(node) |
|
1109 | 1109 | ctx = repo[node] |
|
1110 | ui.status( | |
|
1111 |
|
|
|
1112 | ) | |
|
1110 | summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect') | |
|
1111 | ui.status(_(b'changeset %s: %s\n') % (summary, transition)) | |
|
1113 | 1112 | hbisect.checkstate(state) |
|
1114 | 1113 | # bisect |
|
1115 | 1114 | nodes, changesets, bgood = hbisect.bisect(repo, state) |
@@ -1125,15 +1124,15 b' def bisect(' | |||
|
1125 | 1124 | nodes, changesets, good = hbisect.bisect(repo, state) |
|
1126 | 1125 | if extend: |
|
1127 | 1126 | if not changesets: |
|
1128 |
extend |
|
|
1129 |
if extend |
|
|
1127 | extendctx = hbisect.extendrange(repo, state, nodes, good) | |
|
1128 | if extendctx is not None: | |
|
1130 | 1129 | ui.write( |
|
1131 |
_(b"Extending search to changeset |
|
|
1132 | % (extendnode.rev(), extendnode) | |
|
1133 | ) | |
|
1134 |
state[b'current'] = [extend |
|
|
1130 | _(b"Extending search to changeset %s\n") | |
|
1131 | % cmdutil.format_changeset_summary(ui, extendctx, b'bisect') | |
|
1132 | ) | |
|
1133 | state[b'current'] = [extendctx.node()] | |
|
1135 | 1134 | hbisect.save_state(repo, state) |
|
1136 |
return mayupdate(repo, extend |
|
|
1135 | return mayupdate(repo, extendctx.node()) | |
|
1137 | 1136 | raise error.StateError(_(b"nothing to extend")) |
|
1138 | 1137 | |
|
1139 | 1138 | if changesets == 0: |
@@ -1146,12 +1145,13 b' def bisect(' | |||
|
1146 | 1145 | while size <= changesets: |
|
1147 | 1146 | tests, size = tests + 1, size * 2 |
|
1148 | 1147 | rev = repo.changelog.rev(node) |
|
1148 | summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect') | |
|
1149 | 1149 | ui.write( |
|
1150 | 1150 | _( |
|
1151 |
b"Testing changeset |
|
|
1151 | b"Testing changeset %s " | |
|
1152 | 1152 | b"(%d changesets remaining, ~%d tests)\n" |
|
1153 | 1153 | ) |
|
1154 |
% ( |
|
|
1154 | % (summary, changesets, tests) | |
|
1155 | 1155 | ) |
|
1156 | 1156 | state[b'current'] = [node] |
|
1157 | 1157 | hbisect.save_state(repo, state) |
@@ -200,25 +200,25 b' bisect test' | |||
|
200 | 200 | update: (current) |
|
201 | 201 | phases: 32 draft |
|
202 | 202 | $ hg bisect -g 1 |
|
203 | Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) | |
|
203 | Testing changeset 16:a2e6ea4973e9 "msg 16" (30 changesets remaining, ~4 tests) | |
|
204 | 204 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
205 | 205 | $ hg bisect -g |
|
206 | Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests) | |
|
206 | Testing changeset 23:5ec79163bff4 "msg 23" (15 changesets remaining, ~3 tests) | |
|
207 | 207 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
208 | 208 | |
|
209 | 209 | skip |
|
210 | 210 | |
|
211 | 211 | $ hg bisect -s |
|
212 | Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests) | |
|
212 | Testing changeset 24:10e0acd3809e "msg 24" (15 changesets remaining, ~3 tests) | |
|
213 | 213 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
214 | 214 | $ hg bisect -g |
|
215 | Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests) | |
|
215 | Testing changeset 27:288867a866e9 "msg 27" (7 changesets remaining, ~2 tests) | |
|
216 | 216 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
217 | 217 | $ hg bisect -g |
|
218 | Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests) | |
|
218 | Testing changeset 29:b5bd63375ab9 "msg 29" (4 changesets remaining, ~2 tests) | |
|
219 | 219 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
220 | 220 | $ hg bisect -b |
|
221 | Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests) | |
|
221 | Testing changeset 28:8e0c2264c8af "msg 28" (2 changesets remaining, ~1 tests) | |
|
222 | 222 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
223 | 223 | $ hg bisect -g |
|
224 | 224 | The first bad revision is: |
@@ -234,7 +234,7 b' mark revsets instead of single revs' | |||
|
234 | 234 | $ hg bisect -b "0::3" |
|
235 | 235 | $ hg bisect -s "13::16" |
|
236 | 236 | $ hg bisect -g "26::tip" |
|
237 | Testing changeset 12:1941b52820a5 (23 changesets remaining, ~4 tests) | |
|
237 | Testing changeset 12:1941b52820a5 "msg 12" (23 changesets remaining, ~4 tests) | |
|
238 | 238 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
239 | 239 | $ cat .hg/bisect.state |
|
240 | 240 | bad b99c7b9c8e11558adef3fad9af211c58d46f325b |
@@ -258,25 +258,25 b' bisect reverse test' | |||
|
258 | 258 | $ hg bisect -r |
|
259 | 259 | $ hg bisect -b null |
|
260 | 260 | $ hg bisect -g tip |
|
261 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) | |
|
261 | Testing changeset 15:e7fa0811edb0 "msg 15" (32 changesets remaining, ~5 tests) | |
|
262 | 262 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
263 | 263 | $ hg bisect -g |
|
264 | Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests) | |
|
264 | Testing changeset 7:03750880c6b5 "msg 7" (16 changesets remaining, ~4 tests) | |
|
265 | 265 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
266 | 266 | |
|
267 | 267 | skip |
|
268 | 268 | |
|
269 | 269 | $ hg bisect -s |
|
270 | Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests) | |
|
270 | Testing changeset 6:a3d5c6fdf0d3 "msg 6" (16 changesets remaining, ~4 tests) | |
|
271 | 271 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
272 | 272 | $ hg bisect -g |
|
273 | Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests) | |
|
273 | Testing changeset 2:db07c04beaca "msg 2" (7 changesets remaining, ~2 tests) | |
|
274 | 274 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
275 | 275 | $ hg bisect -g |
|
276 | Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests) | |
|
276 | Testing changeset 0:b99c7b9c8e11 "msg 0" (3 changesets remaining, ~1 tests) | |
|
277 | 277 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
278 | 278 | $ hg bisect -b |
|
279 | Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) | |
|
279 | Testing changeset 1:5cd978ea5149 "msg 1" (2 changesets remaining, ~1 tests) | |
|
280 | 280 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
281 | 281 | $ hg bisect -g |
|
282 | 282 | The first good revision is: |
@@ -295,7 +295,7 b' skip' | |||
|
295 | 295 | $ hg bisect -r |
|
296 | 296 | $ hg bisect -g null |
|
297 | 297 | $ hg bisect -bU tip |
|
298 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) | |
|
298 | Testing changeset 15:e7fa0811edb0 "msg 15" (32 changesets remaining, ~5 tests) | |
|
299 | 299 | $ hg id |
|
300 | 300 | 5cd978ea5149 |
|
301 | 301 | |
@@ -306,13 +306,13 b' Issue1182: hg bisect exception' | |||
|
306 | 306 | $ hg bisect -r |
|
307 | 307 | $ hg bisect -b 4 |
|
308 | 308 | $ hg bisect -g 0 |
|
309 | Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests) | |
|
309 | Testing changeset 2:db07c04beaca "msg 2" (4 changesets remaining, ~2 tests) | |
|
310 | 310 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
311 | 311 | $ hg bisect -s |
|
312 | Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests) | |
|
312 | Testing changeset 1:5cd978ea5149 "msg 1" (4 changesets remaining, ~2 tests) | |
|
313 | 313 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
314 | 314 | $ hg bisect -s |
|
315 | Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests) | |
|
315 | Testing changeset 3:b53bea5e2fcb "msg 3" (4 changesets remaining, ~2 tests) | |
|
316 | 316 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
317 | 317 | $ hg bisect -s |
|
318 | 318 | Due to skipped revisions, the first bad revision could be any of: |
@@ -343,7 +343,7 b' reproduce non converging bisect, issue11' | |||
|
343 | 343 | $ hg bisect -r |
|
344 | 344 | $ hg bisect -g 0 |
|
345 | 345 | $ hg bisect -b 2 |
|
346 | Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) | |
|
346 | Testing changeset 1:5cd978ea5149 "msg 1" (2 changesets remaining, ~1 tests) | |
|
347 | 347 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
348 | 348 | $ hg bisect -s |
|
349 | 349 | Due to skipped revisions, the first bad revision could be any of: |
@@ -372,19 +372,19 b' reproduce AssertionError, issue1445' | |||
|
372 | 372 | $ hg bisect -r |
|
373 | 373 | $ hg bisect -b 6 |
|
374 | 374 | $ hg bisect -g 0 |
|
375 | Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests) | |
|
375 | Testing changeset 3:b53bea5e2fcb "msg 3" (6 changesets remaining, ~2 tests) | |
|
376 | 376 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
377 | 377 | $ hg bisect -s |
|
378 | Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests) | |
|
378 | Testing changeset 2:db07c04beaca "msg 2" (6 changesets remaining, ~2 tests) | |
|
379 | 379 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
380 | 380 | $ hg bisect -s |
|
381 | Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests) | |
|
381 | Testing changeset 4:9b2ba8336a65 "msg 4" (6 changesets remaining, ~2 tests) | |
|
382 | 382 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
383 | 383 | $ hg bisect -s |
|
384 | Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests) | |
|
384 | Testing changeset 1:5cd978ea5149 "msg 1" (6 changesets remaining, ~2 tests) | |
|
385 | 385 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
386 | 386 | $ hg bisect -s |
|
387 | Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests) | |
|
387 | Testing changeset 5:7874a09ea728 "msg 5" (6 changesets remaining, ~2 tests) | |
|
388 | 388 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
389 | 389 | $ hg bisect -g |
|
390 | 390 | The first bad revision is: |
@@ -473,17 +473,17 b' test bisecting command' | |||
|
473 | 473 | $ hg bisect -r |
|
474 | 474 | $ hg up -qr tip |
|
475 | 475 | $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" |
|
476 | changeset 31:58c80a7c8a40: good | |
|
476 | changeset 31:58c80a7c8a40 tip "msg 31": good | |
|
477 | 477 | abort: cannot bisect (no known bad revisions) |
|
478 | 478 | [20] |
|
479 | 479 | $ hg up -qr 0 |
|
480 | 480 | $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" |
|
481 | changeset 0:b99c7b9c8e11: bad | |
|
482 | changeset 15:e7fa0811edb0: good | |
|
483 | changeset 7:03750880c6b5: good | |
|
484 | changeset 3:b53bea5e2fcb: bad | |
|
485 | changeset 5:7874a09ea728: bad | |
|
486 | changeset 6:a3d5c6fdf0d3: good | |
|
481 | changeset 0:b99c7b9c8e11 "msg 0": bad | |
|
482 | changeset 15:e7fa0811edb0 "msg 15": good | |
|
483 | changeset 7:03750880c6b5 "msg 7": good | |
|
484 | changeset 3:b53bea5e2fcb "msg 3": bad | |
|
485 | changeset 5:7874a09ea728 "msg 5": bad | |
|
486 | changeset 6:a3d5c6fdf0d3 "msg 6": good | |
|
487 | 487 | The first good revision is: |
|
488 | 488 | changeset: 6:a3d5c6fdf0d3 |
|
489 | 489 | user: test |
@@ -510,13 +510,13 b' command' | |||
|
510 | 510 | $ hg bisect -r |
|
511 | 511 | $ hg bisect --good tip --noupdate |
|
512 | 512 | $ hg bisect --bad 0 --noupdate |
|
513 | Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests) | |
|
513 | Testing changeset 15:e7fa0811edb0 "msg 15" (31 changesets remaining, ~4 tests) | |
|
514 | 514 | $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" --noupdate |
|
515 | changeset 15:e7fa0811edb0: good | |
|
516 | changeset 7:03750880c6b5: good | |
|
517 | changeset 3:b53bea5e2fcb: bad | |
|
518 | changeset 5:7874a09ea728: bad | |
|
519 | changeset 6:a3d5c6fdf0d3: good | |
|
515 | changeset 15:e7fa0811edb0 "msg 15": good | |
|
516 | changeset 7:03750880c6b5 "msg 7": good | |
|
517 | changeset 3:b53bea5e2fcb "msg 3": bad | |
|
518 | changeset 5:7874a09ea728 "msg 5": bad | |
|
519 | changeset 6:a3d5c6fdf0d3 "msg 6": good | |
|
520 | 520 | The first good revision is: |
|
521 | 521 | changeset: 6:a3d5c6fdf0d3 |
|
522 | 522 | user: test |
@@ -543,17 +543,17 b' test the same case, this time with updat' | |||
|
543 | 543 | $ hg bisect -r |
|
544 | 544 | $ hg up -qr tip |
|
545 | 545 | $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" |
|
546 | changeset 31:58c80a7c8a40: good | |
|
546 | changeset 31:58c80a7c8a40 tip "msg 31": good | |
|
547 | 547 | abort: cannot bisect (no known bad revisions) |
|
548 | 548 | [20] |
|
549 | 549 | $ hg up -qr 0 |
|
550 | 550 | $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" |
|
551 | changeset 0:b99c7b9c8e11: bad | |
|
552 | changeset 15:e7fa0811edb0: good | |
|
553 | changeset 7:03750880c6b5: good | |
|
554 | changeset 3:b53bea5e2fcb: bad | |
|
555 | changeset 5:7874a09ea728: bad | |
|
556 | changeset 6:a3d5c6fdf0d3: good | |
|
551 | changeset 0:b99c7b9c8e11 "msg 0": bad | |
|
552 | changeset 15:e7fa0811edb0 "msg 15": good | |
|
553 | changeset 7:03750880c6b5 "msg 7": good | |
|
554 | changeset 3:b53bea5e2fcb "msg 3": bad | |
|
555 | changeset 5:7874a09ea728 "msg 5": bad | |
|
556 | changeset 6:a3d5c6fdf0d3 "msg 6": good | |
|
557 | 557 | The first good revision is: |
|
558 | 558 | changeset: 6:a3d5c6fdf0d3 |
|
559 | 559 | user: test |
@@ -586,13 +586,13 b' tip is obsolete' | |||
|
586 | 586 | $ hg bisect --reset |
|
587 | 587 | $ hg bisect --good 15 |
|
588 | 588 | $ hg bisect --bad 30 |
|
589 | Testing changeset 22:06c7993750ce (15 changesets remaining, ~3 tests) | |
|
589 | Testing changeset 22:06c7993750ce "msg 22" (15 changesets remaining, ~3 tests) | |
|
590 | 590 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
591 | 591 | $ hg bisect --command true |
|
592 | changeset 22:06c7993750ce: good | |
|
593 | changeset 26:3efc6fd51aeb: good | |
|
594 | changeset 28:8e0c2264c8af: good | |
|
595 | changeset 29:b5bd63375ab9: good | |
|
592 | changeset 22:06c7993750ce "msg 22": good | |
|
593 | changeset 26:3efc6fd51aeb "msg 26": good | |
|
594 | changeset 28:8e0c2264c8af "msg 28": good | |
|
595 | changeset 29:b5bd63375ab9 "msg 29": good | |
|
596 | 596 | The first bad revision is: |
|
597 | 597 | changeset: 30:ed2d2f24b11c |
|
598 | 598 | tag: tip |
@@ -735,11 +735,11 b' Changeset in the bad:good range is obsol' | |||
|
735 | 735 | $ hg bisect --reset |
|
736 | 736 | $ hg bisect --good . |
|
737 | 737 | $ hg bisect --bad 25 |
|
738 | Testing changeset 28:8e0c2264c8af (6 changesets remaining, ~2 tests) | |
|
738 | Testing changeset 28:8e0c2264c8af "msg 28" (6 changesets remaining, ~2 tests) | |
|
739 | 739 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
740 | 740 | $ hg bisect --command true |
|
741 | changeset 28:8e0c2264c8af: good | |
|
742 | changeset 26:3efc6fd51aeb: good | |
|
741 | changeset 28:8e0c2264c8af "msg 28": good | |
|
742 | changeset 26:3efc6fd51aeb "msg 26": good | |
|
743 | 743 | The first good revision is: |
|
744 | 744 | changeset: 26:3efc6fd51aeb |
|
745 | 745 | user: test |
@@ -252,7 +252,7 b' complex bisect test 1 # first bad rev i' | |||
|
252 | 252 | $ hg bisect -r |
|
253 | 253 | $ hg bisect -g 0 |
|
254 | 254 | $ hg bisect -b 17 # -> update to rev 6 |
|
255 | Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests) | |
|
255 | Testing changeset 6:a214d5d3811a "merge 4,5" (15 changesets remaining, ~3 tests) | |
|
256 | 256 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
257 | 257 | $ hg log -q -r 'bisect(pruned)' |
|
258 | 258 | 0:33b1f9bc8bc5 |
@@ -274,16 +274,16 b' complex bisect test 1 # first bad rev i' | |||
|
274 | 274 | 16:609d82a7ebae |
|
275 | 275 | $ hg log -q -r 'bisect(ignored)' |
|
276 | 276 | $ hg bisect -g # -> update to rev 13 |
|
277 | Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests) | |
|
277 | Testing changeset 13:b0a32c86eb31 "13" (9 changesets remaining, ~3 tests) | |
|
278 | 278 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
279 | 279 | $ hg bisect -s # -> update to rev 10 |
|
280 | Testing changeset 10:429fcd26f52d (9 changesets remaining, ~3 tests) | |
|
280 | Testing changeset 10:429fcd26f52d "merge 6,9" (9 changesets remaining, ~3 tests) | |
|
281 | 281 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
282 | 282 | $ hg bisect -b # -> update to rev 8 |
|
283 | Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests) | |
|
283 | Testing changeset 8:dab8161ac8fc "8" (3 changesets remaining, ~1 tests) | |
|
284 | 284 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
285 | 285 | $ hg bisect -g # -> update to rev 9 |
|
286 | Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests) | |
|
286 | Testing changeset 9:3c77083deb4a "9" (2 changesets remaining, ~1 tests) | |
|
287 | 287 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
288 | 288 | $ hg bisect -b |
|
289 | 289 | The first bad revision is: |
@@ -350,10 +350,10 b' complex bisect test 2 # first good rev ' | |||
|
350 | 350 | $ hg bisect -r |
|
351 | 351 | $ hg bisect -g 18 |
|
352 | 352 | $ hg bisect -b 1 # -> update to rev 6 |
|
353 | Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) | |
|
353 | Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests) | |
|
354 | 354 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
355 | 355 | $ hg bisect -s # -> update to rev 10 |
|
356 | Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) | |
|
356 | Testing changeset 10:429fcd26f52d "merge 6,9" (13 changesets remaining, ~3 tests) | |
|
357 | 357 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
358 | 358 | $ hg log -q -r 'bisect(pruned)' |
|
359 | 359 | 0:33b1f9bc8bc5 |
@@ -361,7 +361,7 b' complex bisect test 2 # first good rev ' | |||
|
361 | 361 | 6:a214d5d3811a |
|
362 | 362 | 18:d42e18c7bc9b |
|
363 | 363 | $ hg bisect -b # -> update to rev 12 |
|
364 | Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests) | |
|
364 | Testing changeset 12:9f259202bbe7 "12" (5 changesets remaining, ~2 tests) | |
|
365 | 365 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
366 | 366 | $ hg log -q -r 'bisect(pruned)' |
|
367 | 367 | 0:33b1f9bc8bc5 |
@@ -381,7 +381,7 b' complex bisect test 2 # first good rev ' | |||
|
381 | 381 | 13:b0a32c86eb31 |
|
382 | 382 | 15:857b178a7cf3 |
|
383 | 383 | $ hg bisect -b # -> update to rev 13 |
|
384 | Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests) | |
|
384 | Testing changeset 13:b0a32c86eb31 "13" (3 changesets remaining, ~1 tests) | |
|
385 | 385 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
386 | 386 | $ hg bisect -g |
|
387 | 387 | The first good revision is: |
@@ -414,7 +414,7 b' 10,9,13 are skipped an might be the firs' | |||
|
414 | 414 | $ hg bisect -r |
|
415 | 415 | $ hg bisect -g 1 |
|
416 | 416 | $ hg bisect -b 16 # -> update to rev 6 |
|
417 | Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) | |
|
417 | Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests) | |
|
418 | 418 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
419 | 419 | $ hg log -q -r 'bisect(pruned)' |
|
420 | 420 | 0:33b1f9bc8bc5 |
@@ -422,13 +422,13 b' 10,9,13 are skipped an might be the firs' | |||
|
422 | 422 | 16:609d82a7ebae |
|
423 | 423 | 17:228c06deef46 |
|
424 | 424 | $ hg bisect -g # -> update to rev 13 |
|
425 | Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) | |
|
425 | Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests) | |
|
426 | 426 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
427 | 427 | $ hg bisect -s # -> update to rev 10 |
|
428 | Testing changeset 10:429fcd26f52d (8 changesets remaining, ~3 tests) | |
|
428 | Testing changeset 10:429fcd26f52d "merge 6,9" (8 changesets remaining, ~3 tests) | |
|
429 | 429 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
430 | 430 | $ hg bisect -s # -> update to rev 12 |
|
431 | Testing changeset 12:9f259202bbe7 (8 changesets remaining, ~3 tests) | |
|
431 | Testing changeset 12:9f259202bbe7 "12" (8 changesets remaining, ~3 tests) | |
|
432 | 432 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
433 | 433 | $ hg log -q -r 'bisect(pruned)' |
|
434 | 434 | 0:33b1f9bc8bc5 |
@@ -443,10 +443,10 b' 10,9,13 are skipped an might be the firs' | |||
|
443 | 443 | 16:609d82a7ebae |
|
444 | 444 | 17:228c06deef46 |
|
445 | 445 | $ hg bisect -g # -> update to rev 9 |
|
446 | Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests) | |
|
446 | Testing changeset 9:3c77083deb4a "9" (5 changesets remaining, ~2 tests) | |
|
447 | 447 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
448 | 448 | $ hg bisect -s # -> update to rev 15 |
|
449 | Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests) | |
|
449 | Testing changeset 15:857b178a7cf3 "merge 10,13" (5 changesets remaining, ~2 tests) | |
|
450 | 450 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
451 | 451 | $ hg log -q -r 'bisect(ignored)' |
|
452 | 452 | $ hg bisect -b |
@@ -500,13 +500,13 b' 15,16 are skipped an might be the first ' | |||
|
500 | 500 | $ hg bisect -r |
|
501 | 501 | $ hg bisect -g 17 |
|
502 | 502 | $ hg bisect -b 8 # -> update to rev 10 |
|
503 | Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) | |
|
503 | Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests) | |
|
504 | 504 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
505 | 505 | $ hg bisect -b # -> update to rev 13 |
|
506 | Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests) | |
|
506 | Testing changeset 10:429fcd26f52d "merge 6,9" (5 changesets remaining, ~2 tests) | |
|
507 | 507 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
508 | 508 | $ hg bisect -b # -> update to rev 15 |
|
509 | Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) | |
|
509 | Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests) | |
|
510 | 510 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
511 | 511 | $ hg log -q -r 'bisect(pruned)' |
|
512 | 512 | 0:33b1f9bc8bc5 |
@@ -524,7 +524,7 b' 15,16 are skipped an might be the first ' | |||
|
524 | 524 | 13:b0a32c86eb31 |
|
525 | 525 | 17:228c06deef46 |
|
526 | 526 | $ hg bisect -s # -> update to rev 16 |
|
527 | Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) | |
|
527 | Testing changeset 16:609d82a7ebae "16" (3 changesets remaining, ~1 tests) | |
|
528 | 528 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
529 | 529 | $ hg log -q -r 'bisect(pruned)' |
|
530 | 530 | 0:33b1f9bc8bc5 |
@@ -612,7 +612,7 b' end at merge: 17 bad, 11 good (but 9 is ' | |||
|
612 | 612 | $ hg bisect -r |
|
613 | 613 | $ hg bisect -b 17 |
|
614 | 614 | $ hg bisect -g 11 |
|
615 | Testing changeset 13:b0a32c86eb31 (5 changesets remaining, ~2 tests) | |
|
615 | Testing changeset 13:b0a32c86eb31 "13" (5 changesets remaining, ~2 tests) | |
|
616 | 616 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
617 | 617 | $ hg log -q -r 'bisect(ignored)' |
|
618 | 618 | 2:051e12f87bf1 |
@@ -623,7 +623,7 b' end at merge: 17 bad, 11 good (but 9 is ' | |||
|
623 | 623 | 9:3c77083deb4a |
|
624 | 624 | 10:429fcd26f52d |
|
625 | 625 | $ hg bisect -g |
|
626 | Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) | |
|
626 | Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests) | |
|
627 | 627 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
628 | 628 | $ hg bisect -b |
|
629 | 629 | The first bad revision is: |
@@ -665,7 +665,7 b' end at merge: 17 bad, 11 good (but 9 is ' | |||
|
665 | 665 | 9:3c77083deb4a |
|
666 | 666 | 10:429fcd26f52d |
|
667 | 667 | $ hg bisect --extend |
|
668 | Extending search to changeset 8:dab8161ac8fc | |
|
668 | Extending search to changeset 8:dab8161ac8fc "8" | |
|
669 | 669 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
670 | 670 | $ hg log -q -r 'bisect(untested)' |
|
671 | 671 | $ hg log -q -r 'bisect(ignored)' |
@@ -677,7 +677,7 b' end at merge: 17 bad, 11 good (but 9 is ' | |||
|
677 | 677 | 9:3c77083deb4a |
|
678 | 678 | 10:429fcd26f52d |
|
679 | 679 | $ hg bisect -g # dab8161ac8fc |
|
680 | Testing changeset 9:3c77083deb4a (3 changesets remaining, ~1 tests) | |
|
680 | Testing changeset 9:3c77083deb4a "9" (3 changesets remaining, ~1 tests) | |
|
681 | 681 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
682 | 682 | $ hg log -q -r 'bisect(untested)' |
|
683 | 683 | 9:3c77083deb4a |
@@ -757,13 +757,13 b' user adds irrelevant but consistent info' | |||
|
757 | 757 | $ hg bisect -r |
|
758 | 758 | $ hg bisect -b 13 |
|
759 | 759 | $ hg bisect -g 8 |
|
760 | Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests) | |
|
760 | Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests) | |
|
761 | 761 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
762 | 762 | $ hg log -q -r 'bisect(untested)' |
|
763 | 763 | 11:82ca6f06eccd |
|
764 | 764 | 12:9f259202bbe7 |
|
765 | 765 | $ hg bisect -g 2 |
|
766 | Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests) | |
|
766 | Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests) | |
|
767 | 767 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
768 | 768 | $ hg log -q -r 'bisect(untested)' |
|
769 | 769 | 11:82ca6f06eccd |
@@ -72,13 +72,13 b' mark changesets' | |||
|
72 | 72 | $ hg bisect --good 4 |
|
73 | 73 | $ hg bisect --good 6 |
|
74 | 74 | $ hg bisect --bad 12 |
|
75 | Testing changeset 9:2197c557e14c (6 changesets remaining, ~2 tests) | |
|
75 | Testing changeset 9:2197c557e14c "9=8+3" (6 changesets remaining, ~2 tests) | |
|
76 | 76 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
77 | 77 | $ hg bisect --bad 10 |
|
78 | Testing changeset 8:e74a86251f58 (4 changesets remaining, ~2 tests) | |
|
78 | Testing changeset 8:e74a86251f58 "8" (4 changesets remaining, ~2 tests) | |
|
79 | 79 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
80 | 80 | $ hg bisect --skip 7 |
|
81 | Testing changeset 8:e74a86251f58 (4 changesets remaining, ~2 tests) | |
|
81 | Testing changeset 8:e74a86251f58 "8" (4 changesets remaining, ~2 tests) | |
|
82 | 82 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
83 | 83 | |
|
84 | 84 | test template |
@@ -1606,7 +1606,7 b' Check the bisect template' | |||
|
1606 | 1606 | |
|
1607 | 1607 | $ hg bisect -g 1 |
|
1608 | 1608 | $ hg bisect -b 3 --noupdate |
|
1609 | Testing changeset 2:97054abb4ab8 (2 changesets remaining, ~1 tests) | |
|
1609 | Testing changeset 2:97054abb4ab8 "no person" (2 changesets remaining, ~1 tests) | |
|
1610 | 1610 | $ hg log -T bisect -r 0:4 |
|
1611 | 1611 | changeset: 0:1e4e1b8f71e0 |
|
1612 | 1612 | bisect: good (implicit) |
General Comments 0
You need to be logged in to leave comments.
Login now