##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

debian: switch to using debhelper and dh_python2 to build debs...
debian: switch to using debhelper and dh_python2 to build debs This is a much larger commit than I'd like, but I honestly don't see a good way to break it up and leave things working. Summary: We now use debian/rules with debhelper to build our debs. This is much more standard, and means we use dh_python2 to do things like handle leaving .pyc files out of the built debs. The resulting package is split into mercurial and mercurial-common, with the former being the hg stub and all the native .sos, and the latter being basically everything else. builddeb and dockerdeb are updated to use the new system. The old way (using dpkg by hand) breaks with the above changes because debian/control no longer contains a version string (that's now guessed from the phony changelog.) Tests are updated to assert that the right files end up in the right debs.
"Yann E. MORIN" - - Load All Authors

File last commit:

r15153:fa0a464e default
r26148:7f49efca default
Show More
test-bisect2.t
795 lines | 19.4 KiB | text/troff | Tads3Lexer
/ tests / test-bisect2.t
History | Source | Raw |Copy content |Copy permalink
Martin Geisler
tests: unify test-bisect2
 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
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 (15 changesets remaining, ~3 tests)
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 $ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
17:228c06deef46
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 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"
revset.bisect: add 'ignored' set to the bisect keyword...
 r15147 $ hg log -q -r 'bisect(ignored)'
Martin Geisler
tests: unify test-bisect2
 r11860 $ hg bisect -g # -> update to rev 13
Testing changeset 13:b0a32c86eb31 (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 (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 (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 (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
"Yann E. MORIN"
revset.bisect: add new 'range' set to the bisect keyword...
 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"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 $ hg log -q -r 'bisect(pruned)'
0:33b1f9bc8bc5
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 6:a214d5d3811a
8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
13:b0a32c86eb31
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 15:857b178a7cf3
16:609d82a7ebae
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 17:228c06deef46
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 18:d42e18c7bc9b
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 $ hg log -q -r 'bisect(untested)'
11:82ca6f06eccd
12:9f259202bbe7
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 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
tests: unify test-bisect2
 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
Testing changeset 6:a214d5d3811a (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 (13 changesets remaining, ~3 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 1:4ca5088da217
6:a214d5d3811a
18:d42e18c7bc9b
Martin Geisler
tests: unify test-bisect2
 r11860 $ hg bisect -b # -> update to rev 12
Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 1:4ca5088da217
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 6:a214d5d3811a
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 8:dab8161ac8fc
9:3c77083deb4a
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 10:429fcd26f52d
18:d42e18c7bc9b
$ hg log -q -r 'bisect(untested)'
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
Martin Geisler
tests: unify test-bisect2
 r11860 $ hg bisect -b # -> update to rev 13
Testing changeset 13:b0a32c86eb31 (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
"Yann E. MORIN"
revset.bisect: add new 'range' set to the bisect keyword...
 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
tests: unify test-bisect2
 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
Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests)
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 1:4ca5088da217
16:609d82a7ebae
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 17:228c06deef46
Martin Geisler
tests: unify test-bisect2
 r11860 $ hg bisect -g # -> update to rev 13
Testing changeset 13:b0a32c86eb31 (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 (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 (8 changesets remaining, ~3 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
10:429fcd26f52d
13:b0a32c86eb31
16:609d82a7ebae
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 17:228c06deef46
Martin Geisler
tests: unify test-bisect2
 r11860 $ hg bisect -g # -> update to rev 9
Testing changeset 9:3c77083deb4a (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 (5 changesets remaining, ~2 tests)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
"Yann E. MORIN"
revset.bisect: add 'ignored' set to the bisect keyword...
 r15147 $ hg log -q -r 'bisect(ignored)'
Martin Geisler
tests: unify test-bisect2
 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"
revset.bisect: add new 'range' set to the bisect keyword...
 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"
revset.bisect: add 'ignored' set to the bisect keyword...
 r15147 $ hg log -q -r 'bisect(ignored)'
Martin Geisler
tests: unify test-bisect2
 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
Testing changeset 13:b0a32c86eb31 (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 (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 (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
17:228c06deef46
Martin Geisler
tests: unify test-bisect2
 r11860 $ hg bisect -s # -> update to rev 16
Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 8:dab8161ac8fc
9:3c77083deb4a
10:429fcd26f52d
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
17:228c06deef46
Martin Geisler
tests: unify test-bisect2
 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"
revset.bisect: add new 'range' set to the bisect keyword...
 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"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 8:dab8161ac8fc
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 9:3c77083deb4a
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 10:429fcd26f52d
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 11:82ca6f06eccd
12:9f259202bbe7
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
Matt Mackall
bisect: add test for unrelated starting revisions
 r12007
test unrelated revs:
$ hg bisect --reset
$ hg bisect -b 7
$ hg bisect -g 14
abort: starting revisions are not directly related
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
"Yann E. MORIN"
revset.bisect: add new 'range' set to the bisect keyword...
 r15136 $ hg log -q -r 'bisect(range)'
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
1:4ca5088da217
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 7:50c76098bbf2
14:faa450606157
Matt Mackall
bisect: add test for unrelated starting revisions
 r12007 $ hg bisect --reset
Dirkjan Ochtman
bisect: warn about ending on a merge with only one side marked
 r12178
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 (5 changesets remaining, ~2 tests)
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
"Yann E. MORIN"
revset.bisect: add 'ignored' set to the bisect keyword...
 r15147 $ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
9:3c77083deb4a
10:429fcd26f52d
Dirkjan Ochtman
bisect: warn about ending on a merge with only one side marked
 r12178 $ hg bisect -g
Testing changeset 15:857b178a7cf3 (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.
Benoit Boissinot
bisect: new command to extend the bisect range (issue2690)...
 r13601 Use bisect --extend to continue the bisection from
the common ancestor, dab8161ac8fc.
"Yann E. MORIN"
revset.bisect: add new 'range' set to the bisect keyword...
 r15136 $ hg log -q -r 'bisect(range)'
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
1:4ca5088da217
8:dab8161ac8fc
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 11:82ca6f06eccd
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 12:9f259202bbe7
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 13:b0a32c86eb31
15:857b178a7cf3
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 16:609d82a7ebae
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 17:228c06deef46
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 18:d42e18c7bc9b
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 $ hg log -q -r 'bisect(untested)'
"Yann E. MORIN"
revset.bisect: add 'ignored' set to the bisect keyword...
 r15147 $ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
9:3c77083deb4a
10:429fcd26f52d
Benoit Boissinot
bisect: new command to extend the bisect range (issue2690)...
 r13601 $ hg bisect --extend
Extending search to changeset 8:dab8161ac8fc
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 $ hg log -q -r 'bisect(untested)'
"Yann E. MORIN"
revset.bisect: add 'ignored' set to the bisect keyword...
 r15147 $ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
9:3c77083deb4a
10:429fcd26f52d
Benoit Boissinot
bisect: new command to extend the bisect range (issue2690)...
 r13601 $ hg bisect -g # dab8161ac8fc
Dirkjan Ochtman
bisect: warn about ending on a merge with only one side marked
 r12178 Testing changeset 9:3c77083deb4a (3 changesets remaining, ~1 tests)
Benoit Boissinot
bisect: new command to extend the bisect range (issue2690)...
 r13601 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 $ hg log -q -r 'bisect(untested)'
9:3c77083deb4a
10:429fcd26f52d
"Yann E. MORIN"
revset.bisect: add 'ignored' set to the bisect keyword...
 r15147 $ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 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
bisect: warn about ending on a merge with only one side marked
 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"
revset.bisect: add new 'range' set to the bisect keyword...
 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"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
1:4ca5088da217
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 8:dab8161ac8fc
9:3c77083deb4a
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 10:429fcd26f52d
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 11:82ca6f06eccd
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 12:9f259202bbe7
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 13:b0a32c86eb31
15:857b178a7cf3
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 16:609d82a7ebae
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 17:228c06deef46
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 18:d42e18c7bc9b
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 $ hg log -q -r 'bisect(untested)'
"Yann E. MORIN"
revset.bisect: add 'ignored' set to the bisect keyword...
 r15147 $ hg log -q -r 'bisect(ignored)'
2:051e12f87bf1
3:0950834f0a9c
4:5c668c22234f
5:385a529b6670
6:a214d5d3811a
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 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
hbisect: do not assume that min(good) is an ancestor of min(bad)...
 r14895
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 (3 changesets remaining, ~1 tests)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 $ hg log -q -r 'bisect(untested)'
11:82ca6f06eccd
12:9f259202bbe7
Alexander Krauss
hbisect: do not assume that min(good) is an ancestor of min(bad)...
 r14895 $ hg bisect -g 2
Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 $ hg log -q -r 'bisect(untested)'
11:82ca6f06eccd
12:9f259202bbe7
Alexander Krauss
hbisect: do not assume that min(good) is an ancestor of min(bad)...
 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"
revset.bisect: add new 'range' set to the bisect keyword...
 r15136 $ hg log -q -r 'bisect(range)'
8:dab8161ac8fc
11:82ca6f06eccd
12:9f259202bbe7
13:b0a32c86eb31
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 $ hg log -q -r 'bisect(pruned)'
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 0:33b1f9bc8bc5
1:4ca5088da217
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 2:051e12f87bf1
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 8:dab8161ac8fc
11:82ca6f06eccd
"Yann E. MORIN"
hbisect.get: use simpler code with repo.set(), fix 'pruned' set...
 r15146 12:9f259202bbe7
"Yann E. MORIN"
revset.bisect: add new 'pruned' set to the bisect keyword...
 r15137 13:b0a32c86eb31
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
 r15153 14:faa450606157
15:857b178a7cf3
16:609d82a7ebae
17:228c06deef46
18:d42e18c7bc9b
"Yann E. MORIN"
revset.bisect: add new 'untested' set to the bisect keyword...
 r15138 $ hg log -q -r 'bisect(untested)'