Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-bisect @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 61fcd9fac434
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2924
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
1 #!/bin/sh
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
2
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
3 set -e
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
4
2976
61fcd9fac434 Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2932
diff changeset
5 echo "[extensions]" >> $HGRCPATH
61fcd9fac434 Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2932
diff changeset
6 echo "hbisect=" >> $HGRCPATH
2924
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
7
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
8 echo % init
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
9 hg init
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
10
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
11 echo % committing changes
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
12 count=0
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
13 echo > a
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
14 while test $count -lt 32 ; do
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
15 echo 'a' >> a
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
16 test $count -eq 0 && hg add
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
17 hg ci -m "msg $count" -d "$count 0"
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
18 echo % committed changeset $count
2932
d77022db1bca Solaris portability fixes
Danek Duvall <danek.duvall@sun.com>
parents: 2925
diff changeset
19 count=`expr $count + 1`
2924
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
20 done
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
21
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
22 echo % log
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
23 hg log
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
24
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
25 echo % hg up -C
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
26 hg up -C
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
27
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
28 echo % bisect test
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
29 hg bisect init
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
30 hg bisect bad
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
31 hg bisect good 1
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
32 hg bisect good
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
33 hg bisect good
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
34 hg bisect good
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
35 hg bisect bad
d62ce27d925a tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
36 hg bisect good