Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bisect @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 61fcd9fac434 |
children |
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 |