Mercurial > hg
annotate tests/test-merge3 @ 9462:1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
| author | Christian Ebert <blacktrash@gmx.net> |
|---|---|
| date | Thu, 10 Sep 2009 23:15:37 +0200 |
| parents | 7544700fd931 |
| children | 6a64813276ed |
| 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 |
| 402 | 2 |
| 3 hg init | |
| 4 echo This is file a1 > a | |
| 5 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
|
6 hg commit -m "commit #0" -d "1000000 0" |
| 402 | 7 touch b |
| 8 hg add b | |
| 9 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:
814
diff
changeset
|
10 hg commit -A -m"comment #1" -d "1000000 0" |