Mercurial > hg
annotate tests/test-merge2 @ 10868:1b82ab3c7194
merge with stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 06 Apr 2010 15:40:46 +0200 |
| parents | 9dcf9d45cab8 |
| children |
| 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 |
| 409 | 2 |
| 3 mkdir t | |
| 4 cd t | |
| 5 hg init | |
| 6 echo This is file a1 > a | |
| 7 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:
814
diff
changeset
|
8 hg commit -m "commit #0" -d "1000000 0" |
| 409 | 9 echo This is file b1 > b |
| 10 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:
814
diff
changeset
|
11 hg commit -m "commit #1" -d "1000000 0" |
| 409 | 12 rm b |
| 13 hg update 0 | |
| 14 echo This is file b2 > b | |
| 15 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:
814
diff
changeset
|
16 hg commit -m "commit #2" -d "1000000 0" |
|
3988
9dcf9d45cab8
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
17 cd ..; rm -r t |
| 409 | 18 |
| 19 mkdir t | |
| 20 cd t | |
| 21 hg init | |
| 22 echo This is file a1 > a | |
| 23 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:
814
diff
changeset
|
24 hg commit -m "commit #0" -d "1000000 0" |
| 409 | 25 echo This is file b1 > b |
| 26 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:
814
diff
changeset
|
27 hg commit -m "commit #1" -d "1000000 0" |
| 409 | 28 rm b |
| 29 hg update 0 | |
| 30 echo This is file b2 > b | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
31 hg commit -A -m "commit #2" -d "1000000 0" |
|
3988
9dcf9d45cab8
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
32 cd ..; rm -r t |
| 409 | 33 |
| 34 mkdir t | |
| 35 cd t | |
| 36 hg init | |
| 37 echo This is file a1 > a | |
| 38 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:
814
diff
changeset
|
39 hg commit -m "commit #0" -d "1000000 0" |
| 409 | 40 echo This is file b1 > b |
| 41 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:
814
diff
changeset
|
42 hg commit -m "commit #1" -d "1000000 0" |
| 409 | 43 rm b |
| 44 hg remove b | |
| 45 hg update 0 | |
| 46 echo This is file b2 > b | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
47 hg commit -A -m "commit #2" -d "1000000 0" |