test-bisect2.t
807 lines
| 20.0 KiB
| text/troff
|
Tads3Lexer
/ tests / test-bisect2.t
Martin Geisler
|
r11860 | # 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 | ||||
Pulkit Goyal
|
r32698 | updated to "d42e18c7bc9b: 18" | ||
Pierre-Yves David
|
r28029 | 3 other heads for branch "default" | ||
Martin Geisler
|
r11860 | |||
complex bisect test 1 # first bad rev is 9 | ||||
$ hg bisect -r | ||||
$ hg bisect -g 0 | ||||
$ hg bisect -b 17 # -> update to rev 6 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 6:a214d5d3811a "merge 4,5" (15 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15146 | $ hg log -q -r 'bisect(pruned)' | ||
0:33b1f9bc8bc5 | ||||
17:228c06deef46 | ||||
"Yann E. MORIN"
|
r15138 | $ 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 | ||||
"Yann E. MORIN"
|
r15147 | $ hg log -q -r 'bisect(ignored)' | ||
Martin Geisler
|
r11860 | $ hg bisect -g # -> update to rev 13 | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 13:b0a32c86eb31 "13" (9 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -s # -> update to rev 10 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 10:429fcd26f52d "merge 6,9" (9 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -b # -> update to rev 8 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 8:dab8161ac8fc "8" (3 changesets remaining, ~1 tests) | ||
Martin Geisler
|
r11860 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -g # -> update to rev 9 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 9:3c77083deb4a "9" (2 changesets remaining, ~1 tests) | ||
Martin Geisler
|
r11860 | 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 | ||||
"Yann E. MORIN"
|
r15136 | $ 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 | ||||
"Yann E. MORIN"
|
r15137 | $ hg log -q -r 'bisect(pruned)' | ||
0:33b1f9bc8bc5 | ||||
"Yann E. MORIN"
|
r15146 | 1:4ca5088da217 | ||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
"Yann E. MORIN"
|
r15137 | 6:a214d5d3811a | ||
8:dab8161ac8fc | ||||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
13:b0a32c86eb31 | ||||
"Yann E. MORIN"
|
r15146 | 15:857b178a7cf3 | ||
16:609d82a7ebae | ||||
"Yann E. MORIN"
|
r15137 | 17:228c06deef46 | ||
"Yann E. MORIN"
|
r15153 | 18:d42e18c7bc9b | ||
"Yann E. MORIN"
|
r15138 | $ hg log -q -r 'bisect(untested)' | ||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
"Yann E. MORIN"
|
r15153 | $ 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 | ||||
Martin Geisler
|
r11860 | |||
complex bisect test 2 # first good rev is 13 | ||||
$ hg bisect -r | ||||
$ hg bisect -g 18 | ||||
$ hg bisect -b 1 # -> update to rev 6 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -s # -> update to rev 10 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 10:429fcd26f52d "merge 6,9" (13 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15146 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
"Yann E. MORIN"
|
r15146 | 1:4ca5088da217 | ||
6:a214d5d3811a | ||||
18:d42e18c7bc9b | ||||
Martin Geisler
|
r11860 | $ hg bisect -b # -> update to rev 12 | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 12:9f259202bbe7 "12" (5 changesets remaining, ~2 tests) | ||
Martin Geisler
|
r11860 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15146 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
"Yann E. MORIN"
|
r15146 | 1:4ca5088da217 | ||
"Yann E. MORIN"
|
r15138 | 2:051e12f87bf1 | ||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
"Yann E. MORIN"
|
r15146 | 6:a214d5d3811a | ||
"Yann E. MORIN"
|
r15138 | 8:dab8161ac8fc | ||
9:3c77083deb4a | ||||
"Yann E. MORIN"
|
r15146 | 10:429fcd26f52d | ||
18:d42e18c7bc9b | ||||
$ hg log -q -r 'bisect(untested)' | ||||
"Yann E. MORIN"
|
r15138 | 11:82ca6f06eccd | ||
12:9f259202bbe7 | ||||
13:b0a32c86eb31 | ||||
15:857b178a7cf3 | ||||
Martin Geisler
|
r11860 | $ hg bisect -b # -> update to rev 13 | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 13:b0a32c86eb31 "13" (3 changesets remaining, ~1 tests) | ||
Martin Geisler
|
r11860 | 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 | ||||
"Yann E. MORIN"
|
r15136 | $ 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 | ||||
Martin Geisler
|
r11860 | |||
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 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15146 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
"Yann E. MORIN"
|
r15146 | 1:4ca5088da217 | ||
16:609d82a7ebae | ||||
"Yann E. MORIN"
|
r15153 | 17:228c06deef46 | ||
Martin Geisler
|
r11860 | $ hg bisect -g # -> update to rev 13 | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -s # -> update to rev 10 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 10:429fcd26f52d "merge 6,9" (8 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -s # -> update to rev 12 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 12:9f259202bbe7 "12" (8 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15146 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
"Yann E. MORIN"
|
r15146 | 1:4ca5088da217 | ||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
10:429fcd26f52d | ||||
13:b0a32c86eb31 | ||||
16:609d82a7ebae | ||||
"Yann E. MORIN"
|
r15153 | 17:228c06deef46 | ||
Martin Geisler
|
r11860 | $ hg bisect -g # -> update to rev 9 | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 9:3c77083deb4a "9" (5 changesets remaining, ~2 tests) | ||
Martin Geisler
|
r11860 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -s # -> update to rev 15 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 15:857b178a7cf3 "merge 10,13" (5 changesets remaining, ~2 tests) | ||
Martin Geisler
|
r11860 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15147 | $ hg log -q -r 'bisect(ignored)' | ||
Martin Geisler
|
r11860 | $ 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 | ||||
"Yann E. MORIN"
|
r15136 | $ 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 | ||||
"Yann E. MORIN"
|
r15147 | $ hg log -q -r 'bisect(ignored)' | ||
Martin Geisler
|
r11860 | |||
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 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests) | ||
Martin Geisler
|
r11860 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -b # -> update to rev 13 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 10:429fcd26f52d "merge 6,9" (5 changesets remaining, ~2 tests) | ||
Martin Geisler
|
r11860 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
$ hg bisect -b # -> update to rev 15 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests) | ||
Martin Geisler
|
r11860 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15146 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
1:4ca5088da217 | ||||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
"Yann E. MORIN"
|
r15146 | 8:dab8161ac8fc | ||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
13:b0a32c86eb31 | ||||
17:228c06deef46 | ||||
Martin Geisler
|
r11860 | $ hg bisect -s # -> update to rev 16 | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 16:609d82a7ebae "16" (3 changesets remaining, ~1 tests) | ||
Martin Geisler
|
r11860 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15146 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
1:4ca5088da217 | ||||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
"Yann E. MORIN"
|
r15146 | 8:dab8161ac8fc | ||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
13:b0a32c86eb31 | ||||
15:857b178a7cf3 | ||||
17:228c06deef46 | ||||
Martin Geisler
|
r11860 | $ 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 | ||||
"Yann E. MORIN"
|
r15136 | $ hg log -q -r 'bisect(range)' | ||
8:dab8161ac8fc | ||||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
13:b0a32c86eb31 | ||||
15:857b178a7cf3 | ||||
16:609d82a7ebae | ||||
17:228c06deef46 | ||||
"Yann E. MORIN"
|
r15137 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
1:4ca5088da217 | ||||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
"Yann E. MORIN"
|
r15137 | 8:dab8161ac8fc | ||
"Yann E. MORIN"
|
r15146 | 9:3c77083deb4a | ||
"Yann E. MORIN"
|
r15137 | 10:429fcd26f52d | ||
"Yann E. MORIN"
|
r15146 | 11:82ca6f06eccd | ||
12:9f259202bbe7 | ||||
"Yann E. MORIN"
|
r15137 | 13:b0a32c86eb31 | ||
15:857b178a7cf3 | ||||
16:609d82a7ebae | ||||
17:228c06deef46 | ||||
Matt Mackall
|
r12007 | |||
test unrelated revs: | ||||
$ hg bisect --reset | ||||
$ hg bisect -b 7 | ||||
$ hg bisect -g 14 | ||||
abort: starting revisions are not directly related | ||||
Matt Mackall
|
r12316 | [255] | ||
"Yann E. MORIN"
|
r15136 | $ hg log -q -r 'bisect(range)' | ||
"Yann E. MORIN"
|
r15137 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
1:4ca5088da217 | ||||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
"Yann E. MORIN"
|
r15146 | 7:50c76098bbf2 | ||
14:faa450606157 | ||||
Matt Mackall
|
r12007 | $ hg bisect --reset | ||
Dirkjan Ochtman
|
r12178 | |||
end at merge: 17 bad, 11 good (but 9 is first bad) | ||||
$ hg bisect -r | ||||
$ hg bisect -b 17 | ||||
$ hg bisect -g 11 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 13:b0a32c86eb31 "13" (5 changesets remaining, ~2 tests) | ||
Dirkjan Ochtman
|
r12178 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15147 | $ hg log -q -r 'bisect(ignored)' | ||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
Dirkjan Ochtman
|
r12178 | $ hg bisect -g | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests) | ||
Dirkjan Ochtman
|
r12178 | 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. | ||||
Benoit Boissinot
|
r13601 | Use bisect --extend to continue the bisection from | ||
the common ancestor, dab8161ac8fc. | ||||
"Yann E. MORIN"
|
r15136 | $ hg log -q -r 'bisect(range)' | ||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
13:b0a32c86eb31 | ||||
15:857b178a7cf3 | ||||
16:609d82a7ebae | ||||
17:228c06deef46 | ||||
"Yann E. MORIN"
|
r15137 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
1:4ca5088da217 | ||||
8:dab8161ac8fc | ||||
"Yann E. MORIN"
|
r15137 | 11:82ca6f06eccd | ||
"Yann E. MORIN"
|
r15146 | 12:9f259202bbe7 | ||
"Yann E. MORIN"
|
r15137 | 13:b0a32c86eb31 | ||
15:857b178a7cf3 | ||||
"Yann E. MORIN"
|
r15146 | 16:609d82a7ebae | ||
"Yann E. MORIN"
|
r15137 | 17:228c06deef46 | ||
"Yann E. MORIN"
|
r15153 | 18:d42e18c7bc9b | ||
"Yann E. MORIN"
|
r15138 | $ hg log -q -r 'bisect(untested)' | ||
"Yann E. MORIN"
|
r15147 | $ hg log -q -r 'bisect(ignored)' | ||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
Benoit Boissinot
|
r13601 | $ hg bisect --extend | ||
Martin von Zweigbergk
|
r47556 | Extending search to changeset 8:dab8161ac8fc "8" | ||
Benoit Boissinot
|
r13601 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15138 | $ hg log -q -r 'bisect(untested)' | ||
"Yann E. MORIN"
|
r15147 | $ hg log -q -r 'bisect(ignored)' | ||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
Benoit Boissinot
|
r13601 | $ hg bisect -g # dab8161ac8fc | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 9:3c77083deb4a "9" (3 changesets remaining, ~1 tests) | ||
Benoit Boissinot
|
r13601 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15146 | $ hg log -q -r 'bisect(untested)' | ||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
"Yann E. MORIN"
|
r15147 | $ hg log -q -r 'bisect(ignored)' | ||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
"Yann E. MORIN"
|
r15153 | $ 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 | ||||
Dirkjan Ochtman
|
r12178 | $ hg bisect -b | ||
The first bad revision is: | ||||
changeset: 9:3c77083deb4a | ||||
user: test | ||||
date: Thu Jan 01 00:00:09 1970 +0000 | ||||
summary: 9 | ||||
"Yann E. MORIN"
|
r15136 | $ hg log -q -r 'bisect(range)' | ||
8:dab8161ac8fc | ||||
9:3c77083deb4a | ||||
10:429fcd26f52d | ||||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
13:b0a32c86eb31 | ||||
15:857b178a7cf3 | ||||
16:609d82a7ebae | ||||
17:228c06deef46 | ||||
"Yann E. MORIN"
|
r15137 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
1:4ca5088da217 | ||||
"Yann E. MORIN"
|
r15137 | 8:dab8161ac8fc | ||
9:3c77083deb4a | ||||
"Yann E. MORIN"
|
r15146 | 10:429fcd26f52d | ||
"Yann E. MORIN"
|
r15137 | 11:82ca6f06eccd | ||
"Yann E. MORIN"
|
r15146 | 12:9f259202bbe7 | ||
"Yann E. MORIN"
|
r15137 | 13:b0a32c86eb31 | ||
15:857b178a7cf3 | ||||
"Yann E. MORIN"
|
r15146 | 16:609d82a7ebae | ||
"Yann E. MORIN"
|
r15137 | 17:228c06deef46 | ||
"Yann E. MORIN"
|
r15153 | 18:d42e18c7bc9b | ||
"Yann E. MORIN"
|
r15138 | $ hg log -q -r 'bisect(untested)' | ||
"Yann E. MORIN"
|
r15147 | $ hg log -q -r 'bisect(ignored)' | ||
2:051e12f87bf1 | ||||
3:0950834f0a9c | ||||
4:5c668c22234f | ||||
5:385a529b6670 | ||||
6:a214d5d3811a | ||||
"Yann E. MORIN"
|
r15153 | $ 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 | ||||
Alexander Krauss
|
r14895 | |||
user adds irrelevant but consistent information (here: -g 2) to bisect state | ||||
$ hg bisect -r | ||||
$ hg bisect -b 13 | ||||
$ hg bisect -g 8 | ||||
Martin von Zweigbergk
|
r47556 | Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests) | ||
Alexander Krauss
|
r14895 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15138 | $ hg log -q -r 'bisect(untested)' | ||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
Alexander Krauss
|
r14895 | $ hg bisect -g 2 | ||
Martin von Zweigbergk
|
r47556 | Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests) | ||
Alexander Krauss
|
r14895 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
"Yann E. MORIN"
|
r15138 | $ hg log -q -r 'bisect(untested)' | ||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
Alexander Krauss
|
r14895 | $ 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 | ||||
"Yann E. MORIN"
|
r15136 | $ hg log -q -r 'bisect(range)' | ||
8:dab8161ac8fc | ||||
11:82ca6f06eccd | ||||
12:9f259202bbe7 | ||||
13:b0a32c86eb31 | ||||
"Yann E. MORIN"
|
r15137 | $ hg log -q -r 'bisect(pruned)' | ||
"Yann E. MORIN"
|
r15153 | 0:33b1f9bc8bc5 | ||
1:4ca5088da217 | ||||
"Yann E. MORIN"
|
r15137 | 8:dab8161ac8fc | ||
11:82ca6f06eccd | ||||
"Yann E. MORIN"
|
r15146 | 12:9f259202bbe7 | ||
"Yann E. MORIN"
|
r15137 | 13:b0a32c86eb31 | ||
"Yann E. MORIN"
|
r15153 | 14:faa450606157 | ||
15:857b178a7cf3 | ||||
16:609d82a7ebae | ||||
17:228c06deef46 | ||||
18:d42e18c7bc9b | ||||
"Yann E. MORIN"
|
r15138 | $ hg log -q -r 'bisect(untested)' | ||
r50724 | ||||
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] | ||||