Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rawcommit1 @ 2698:c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
qnew and qimport did not take comments into account when deciding where
to place new patches in the series file.
author | Chris Mason <mason@suse.com> |
---|---|
date | Thu, 27 Jul 2006 09:27:42 -0700 |
parents | 7544700fd931 |
children | 9fe62e2db71d |
rev | line source |
---|---|
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" |
591 | 9 hg manifest 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 |
591 | 12 hg manifest 2 |
13 hg 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 |
591 | 16 hg manifest 3 |
17 hg 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 |
591 | 20 hg manifest 4 |
21 hg 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 |
591 | 24 hg manifest 5 |
25 hg 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 |
591 | 28 hg manifest 6 |
29 hg 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 |
591 | 32 hg manifest 7 |
33 hg parents |