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.
#!/bin/sh
# No local source
hg clone a b
echo $?
# No remote source
hg clone http://127.0.0.1:3121/a b
echo $?
rm -rf b # work around bug with http clone
# Inaccessible source
mkdir a
chmod 000 a
hg clone a b
echo $?
# Inaccessible destination
mkdir b
cd b
hg init
hg clone . ../a
echo $?
cd ..
chmod 700 a
rm -r a b
# Source of wrong type
if "$TESTDIR/hghave" -q fifo; then
mkfifo a
hg clone a b
echo $?
rm a
else
echo "abort: repository a not found!"
echo 255
fi
# Default destination, same directory
mkdir q
cd q
hg init
cd ..
hg clone q
true