tests/test-empty-dir
author Bernhard Leiner <bleiner@gmail.com>
Sat, 02 Aug 2008 22:10:10 +0200
changeset 6858 8f256bf98219
parent 3469 33b6c8193652
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/sh
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     2
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     3
hg init
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     4
echo 123 > a
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     5
hg add a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
     6
hg commit -m "first" -d "1000000 0" a
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     7
mkdir sub
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     8
echo 321 > sub/b
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     9
hg add sub/b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
    10
hg commit -m "second" -d "1000000 0" sub/b
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    11
cat sub/b
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    12
hg co 0
1926
ba198d17eea9 changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents: 814
diff changeset
    13
cat sub/b 2>/dev/null || echo "sub/b not present"
3469
33b6c8193652 Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3428
diff changeset
    14
test -d sub || echo "sub not present"
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    15
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    16
true