author | Patrick Mezard <pmezard@gmail.com> |
Sat, 19 Jan 2008 14:48:31 +0100 | |
changeset 5896 | ff7fb4f0db53 |
parent 3736 | ad3d5b4367cb |
permissions | -rwxr-xr-x |
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 |
#!/bin/sh |
591 | 2 |
hg --debug init |
444 | 3 |
echo this is a1 > a |
591 | 4 |
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:
1308
diff
changeset
|
5 |
hg commit -m0 -d "1000000 0" |
444 | 6 |
echo this is b1 > b |
591 | 7 |
hg add b |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1308
diff
changeset
|
8 |
hg commit -m1 -d "1000000 0" |
3736 | 9 |
hg manifest --debug 1 |
444 | 10 |
echo this is c1 > c |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1308
diff
changeset
|
11 |
hg rawcommit -p 1 -d "1000000 0" -m2 c |
3736 | 12 |
hg manifest --debug 2 |
3377
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
13 |
hg -v parents |
444 | 14 |
rm b |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1308
diff
changeset
|
15 |
hg rawcommit -p 2 -d "1000000 0" -m3 b |
3736 | 16 |
hg manifest --debug 3 |
3377
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
17 |
hg -v parents |
444 | 18 |
echo this is a22 > a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1308
diff
changeset
|
19 |
hg rawcommit -p 3 -d "1000000 0" -m4 a |
3736 | 20 |
hg manifest --debug 4 |
3377
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
21 |
hg -v parents |
444 | 22 |
echo this is c22 > c |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1308
diff
changeset
|
23 |
hg rawcommit -p 1 -d "1000000 0" -m5 c |
3736 | 24 |
hg manifest --debug 5 |
3377
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
25 |
hg -v parents |
444 | 26 |
# merge, but no files changed |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1308
diff
changeset
|
27 |
hg rawcommit -p 4 -p 5 -d "1000000 0" -m6 |
3736 | 28 |
hg manifest --debug 6 |
3377
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
29 |
hg -v parents |
444 | 30 |
# no changes what-so-ever |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1308
diff
changeset
|
31 |
hg rawcommit -p 6 -d "1000000 0" -m7 |
3736 | 32 |
hg manifest --debug 7 |
3377
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
33 |
hg -v parents |