Add support for multiple possible bisect results (
issue1228,
issue1182)
The real reason for both issue is that bisect can not handle cases where there
are multiple possibilities for the result.
Example (from
issue1228):
rev 0 -> good
rev 1 -> skipped
rev 2 -> skipped
rev 3 -> skipped
rev 4 -> bad
Note that this patch does not only fix the reported Assertion Error but also
the problem of a non converging bisect:
hg init
for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done
hg bisect -b 2
hg bisect -g 0
hg bisect -s
From this state on, you can:
a) mark as bad forever (non converging!)
b) mark as good to get an inconsistent state
c) skip for the Assertion Error
Minor description and code edits by pmezard.
adding a
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect ssl error
pushing to http://localhost/
searching for changes
ssl required
% serve errors
% expect authorization error
abort: authorization failed
pushing to http://localhost/
searching for changes
% serve errors
% expect authorization error: must have authorized user
abort: authorization failed
pushing to http://localhost/
searching for changes
% serve errors
% expect success
pushing to http://localhost/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
% serve errors
changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http
rolling back last transaction
% expect authorization error: all users denied
abort: authorization failed
pushing to http://localhost/
searching for changes
% serve errors
% expect authorization error: some users denied, users must be authenticated
abort: authorization failed
pushing to http://localhost/
searching for changes
% serve errors