1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807
|
# The tests in test-bisect are done on a linear history. Here the
# following repository history is used for testing:
#
# 17
# |
# 18 16
# \ /
# 15
# / \
# / \
# 10 13
# / \ |
# / \ | 14
# 7 6 9 12 /
# \ / \ | |/
# 4 \ | 11
# \ \ | /
# 3 5 | /
# \ / |/
# 2 8
# \ /
# 1
# |
# 0
init
$ hg init
committing changes
$ echo > a
$ echo '0' >> a
$ hg add a
$ hg ci -m "0" -d "0 0"
$ echo '1' >> a
$ hg ci -m "1" -d "1 0"
$ echo '2' >> a
$ hg ci -m "2" -d "2 0"
$ echo '3' >> a
$ hg ci -m "3" -d "3 0"
$ echo '4' >> a
$ hg ci -m "4" -d "4 0"
create branch
$ hg up -r 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo '5' >> b
$ hg add b
$ hg ci -m "5" -d "5 0"
created new head
merge
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge 4,5" -d "6 0"
create branch
$ hg up -r 4
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo '7' > c
$ hg add c
$ hg ci -m "7" -d "7 0"
created new head
create branch
$ hg up -r 1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo '8' > d
$ hg add d
$ hg ci -m "8" -d "8 0"
created new head
$ echo '9' >> d
$ hg ci -m "9" -d "9 0"
merge
$ hg merge -r 6
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge 6,9" -d "10 0"
create branch
$ hg up -r 8
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo '11' > e
$ hg add e
$ hg ci -m "11" -d "11 0"
created new head
$ echo '12' >> e
$ hg ci -m "12" -d "12 0"
$ echo '13' >> e
$ hg ci -m "13" -d "13 0"
create branch
$ hg up -r 11
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo '14' > f
$ hg add f
$ hg ci -m "14" -d "14 0"
created new head
merge
$ hg up -r 13 -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge -r 10
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge 10,13" -d "15 0"
$ echo '16' >> e
$ hg ci -m "16" -d "16 0"
$ echo '17' >> e
$ hg ci -m "17" -d "17 0"
create branch
$ hg up -r 15
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo '18' >> e
$ hg ci -m "18" -d "18 0"
created new head
log
$ hg log
changeset: 18:d42e18c7bc9b
tag: tip
parent: 15:857b178a7cf3
user: test
date: Thu Jan 01 00:00:18 1970 +0000
summary: 18
changeset: 17:228c06deef46
user: test
date: Thu Jan 01 00:00:17 1970 +0000
summary: 17
changeset: 16:609d82a7ebae
user: test
date: Thu Jan 01 00:00:16 1970 +0000
summary: 16
changeset: 15:857b178a7cf3
parent: 13:b0a32c86eb31
parent: 10:429fcd26f52d
user: test
date: Thu Jan 01 00:00:15 1970 +0000
summary: merge 10,13
changeset: 14:faa450606157
parent: 11:82ca6f06eccd
user: test
date: Thu Jan 01 00:00:14 1970 +0000
summary: 14
changeset: 13:b0a32c86eb31
user: test
date: Thu Jan 01 00:00:13 1970 +0000
summary: 13
changeset: 12:9f259202bbe7
user: test
date: Thu Jan 01 00:00:12 1970 +0000
summary: 12
changeset: 11:82ca6f06eccd
parent: 8:dab8161ac8fc
user: test
date: Thu Jan 01 00:00:11 1970 +0000
summary: 11
changeset: 10:429fcd26f52d
parent: 9:3c77083deb4a
parent: 6:a214d5d3811a
user: test
date: Thu Jan 01 00:00:10 1970 +0000
summary: merge 6,9
changeset: 9:3c77083deb4a
user: test
date: Thu Jan 01 00:00:09 1970 +0000
summary: 9
changeset: 8:dab8161ac8fc
parent: 1:4ca5088da217
user: test
date: Thu Jan 01 00:00:08 1970 +0000
summary: 8
changeset: 7:50c76098bbf2
parent: 4:5c668c22234f
user: test
date: Thu Jan 01 00:00:07 1970 +0000
summary: 7
changeset: 6:a214d5d3811a
parent: 5:385a529b6670
parent: 4:5c668c22234f
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: merge 4,5
changeset: 5:385a529b6670
parent: 2:051e12f87bf1
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: 5
changeset: 4:5c668c22234f
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: 4
changeset: 3:0950834f0a9c
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: 3
changeset: 2:051e12f87bf1
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: 2
changeset: 1:4ca5088da217
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: 1
changeset: 0:33b1f9bc8bc5
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
hg up -C
$ hg up -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "d42e18c7bc9b: 18"
3 other heads for branch "default"
complex bisect test 1 # first bad rev is 9
$ hg bisect -r
$ hg bisect -g 0
$ hg bisect -b 17 # -> update to rev 6
Testing changeset 6:a214d5d3811a "merge 4,5" (15 changesets remaining, ~3 tests)
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
17:228c06deef46
$ hg log -q -r 'bisect(untested)'
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
$ hg log -q -r 'bisect(ignored)'
$ hg bisect -g # -> update to rev 13
Testing changeset 13:b0a32c86eb31 "13" (9 changesets remaining, ~3 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -s # -> update to rev 10
Testing changeset 10:429fcd26f52d "merge 6,9" (9 changesets remaining, ~3 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -b # -> update to rev 8
Testing changeset 8:dab8161ac8fc "8" (3 changesets remaining, ~1 tests)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -g # -> update to rev 9
Testing changeset 9:3c77083deb4a "9" (2 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -b
The first bad revision is:
changeset: 9:3c77083deb4a
user: test
date: Thu Jan 01 00:00:09 1970 +0000
summary: 9
$ hg log -q -r 'bisect(range)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
18:d42e18c7bc9b
$ hg log -q -r 'bisect(untested)'
11:82ca6f06eccd
12:9f259202bbe7
$ hg log -q -r 'bisect(goods)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
$ hg log -q -r 'bisect(bads)'
9:3c77083deb4a
10:429fcd26f52d
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
18:d42e18c7bc9b
complex bisect test 2 # first good rev is 13
$ hg bisect -r
$ hg bisect -g 18
$ hg bisect -b 1 # -> update to rev 6
Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -s # -> update to rev 10
Testing changeset 10:429fcd26f52d "merge 6,9" (13 changesets remaining, ~3 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
6:a214d5d3811a
18:d42e18c7bc9b
$ hg bisect -b # -> update to rev 12
Testing changeset 12:9f259202bbe7 "12" (5 changesets remaining, ~2 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
18:d42e18c7bc9b
$ hg log -q -r 'bisect(untested)'
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
$ hg bisect -b # -> update to rev 13
Testing changeset 13:b0a32c86eb31 "13" (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
The first good revision is:
changeset: 13:b0a32c86eb31
user: test
date: Thu Jan 01 00:00:13 1970 +0000
summary: 13
$ hg log -q -r 'bisect(range)'
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
18:d42e18c7bc9b
complex bisect test 3
first bad rev is 15
10,9,13 are skipped an might be the first bad revisions as well
$ hg bisect -r
$ hg bisect -g 1
$ hg bisect -b 16 # -> update to rev 6
Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests)
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
16:609d82a7ebae
17:228c06deef46
$ hg bisect -g # -> update to rev 13
Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -s # -> update to rev 10
Testing changeset 10:429fcd26f52d "merge 6,9" (8 changesets remaining, ~3 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -s # -> update to rev 12
Testing changeset 12:9f259202bbe7 "12" (8 changesets remaining, ~3 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
10:429fcd26f52d
13:b0a32c86eb31
16:609d82a7ebae
17:228c06deef46
$ hg bisect -g # -> update to rev 9
Testing changeset 9:3c77083deb4a "9" (5 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -s # -> update to rev 15
Testing changeset 15:857b178a7cf3 "merge 10,13" (5 changesets remaining, ~2 tests)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -q -r 'bisect(ignored)'
$ hg bisect -b
Due to skipped revisions, the first bad revision could be any of:
changeset: 9:3c77083deb4a
user: test
date: Thu Jan 01 00:00:09 1970 +0000
summary: 9
changeset: 10:429fcd26f52d
parent: 9:3c77083deb4a
parent: 6:a214d5d3811a
user: test
date: Thu Jan 01 00:00:10 1970 +0000
summary: merge 6,9
changeset: 13:b0a32c86eb31
user: test
date: Thu Jan 01 00:00:13 1970 +0000
summary: 13
changeset: 15:857b178a7cf3
parent: 13:b0a32c86eb31
parent: 10:429fcd26f52d
user: test
date: Thu Jan 01 00:00:15 1970 +0000
summary: merge 10,13
$ hg log -q -r 'bisect(range)'
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
$ hg log -q -r 'bisect(ignored)'
complex bisect test 4
first good revision is 17
15,16 are skipped an might be the first good revisions as well
$ hg bisect -r
$ hg bisect -g 17
$ hg bisect -b 8 # -> update to rev 10
Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -b # -> update to rev 13
Testing changeset 10:429fcd26f52d "merge 6,9" (5 changesets remaining, ~2 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg bisect -b # -> update to rev 15
Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
17:228c06deef46
$ hg bisect -s # -> update to rev 16
Testing changeset 16:609d82a7ebae "16" (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
17:228c06deef46
$ hg bisect -s
Due to skipped revisions, the first good revision could be any of:
changeset: 15:857b178a7cf3
parent: 13:b0a32c86eb31
parent: 10:429fcd26f52d
user: test
date: Thu Jan 01 00:00:15 1970 +0000
summary: merge 10,13
changeset: 16:609d82a7ebae
user: test
date: Thu Jan 01 00:00:16 1970 +0000
summary: 16
changeset: 17:228c06deef46
user: test
date: Thu Jan 01 00:00:17 1970 +0000
summary: 17
$ hg log -q -r 'bisect(range)'
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
test unrelated revs:
$ hg bisect --reset
$ hg bisect -b 7
$ hg bisect -g 14
abort: starting revisions are not directly related
[255]
$ hg log -q -r 'bisect(range)'
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
7:50c76098bbf2
14:faa450606157
$ hg bisect --reset
end at merge: 17 bad, 11 good (but 9 is first bad)
$ hg bisect -r
$ hg bisect -b 17
$ hg bisect -g 11
Testing changeset 13:b0a32c86eb31 "13" (5 changesets remaining, ~2 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
9:3c77083deb4a
10:429fcd26f52d
$ hg bisect -g
Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -b
The first bad revision is:
changeset: 15:857b178a7cf3
parent: 13:b0a32c86eb31
parent: 10:429fcd26f52d
user: test
date: Thu Jan 01 00:00:15 1970 +0000
summary: merge 10,13
Not all ancestors of this changeset have been checked.
Use bisect --extend to continue the bisection from
the common ancestor, dab8161ac8fc.
$ hg log -q -r 'bisect(range)'
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
8:dab8161ac8fc
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
18:d42e18c7bc9b
$ hg log -q -r 'bisect(untested)'
$ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
9:3c77083deb4a
10:429fcd26f52d
$ hg bisect --extend
Extending search to changeset 8:dab8161ac8fc "8"
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -q -r 'bisect(untested)'
$ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
9:3c77083deb4a
10:429fcd26f52d
$ hg bisect -g # dab8161ac8fc
Testing changeset 9:3c77083deb4a "9" (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -q -r 'bisect(untested)'
9:3c77083deb4a
10:429fcd26f52d
$ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
$ hg log -q -r 'bisect(goods)'
0:33b1f9bc8bc5
1:4ca5088da217
8:dab8161ac8fc
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
$ hg log -q -r 'bisect(bads)'
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
18:d42e18c7bc9b
$ hg bisect -b
The first bad revision is:
changeset: 9:3c77083deb4a
user: test
date: Thu Jan 01 00:00:09 1970 +0000
summary: 9
$ hg log -q -r 'bisect(range)'
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
18:d42e18c7bc9b
$ hg log -q -r 'bisect(untested)'
$ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
$ hg log -q -r 'bisect(goods)'
0:33b1f9bc8bc5
1:4ca5088da217
8:dab8161ac8fc
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
$ hg log -q -r 'bisect(bads)'
9:3c77083deb4a
10:429fcd26f52d
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
18:d42e18c7bc9b
user adds irrelevant but consistent information (here: -g 2) to bisect state
$ hg bisect -r
$ hg bisect -b 13
$ hg bisect -g 8
Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -q -r 'bisect(untested)'
11:82ca6f06eccd
12:9f259202bbe7
$ hg bisect -g 2
Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -q -r 'bisect(untested)'
11:82ca6f06eccd
12:9f259202bbe7
$ hg bisect -b
The first bad revision is:
changeset: 11:82ca6f06eccd
parent: 8:dab8161ac8fc
user: test
date: Thu Jan 01 00:00:11 1970 +0000
summary: 11
$ hg log -q -r 'bisect(range)'
8:dab8161ac8fc
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
$ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
1:4ca5088da217
8:dab8161ac8fc
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
14:faa450606157
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
18:d42e18c7bc9b
$ hg log -q -r 'bisect(untested)'
in-progress bisect interacts with hg merge (issue6527)
$ hg up -r 17 -q
$ hg merge 7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg merge --abort
abort: cannot abort merge with bisect in progress
(use 'hg bisect --reset')
[20]
|