author | Thomas Arendsen Hein <thomas@intevation.de> |
Fri, 10 Mar 2006 10:44:17 +0100 | |
changeset 1873 | 205f04b04ec6 |
parent 814 | 0902ffece4b4 |
child 1933 | 7544700fd931 |
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 |
383
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
2 |
hg init |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
3 |
echo This is file a1 > a |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
4 |
hg add a |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
383
diff
changeset
|
5 |
hg commit -m "commit #0" -d "0 0" |
383
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
6 |
ls |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
7 |
echo This is file b1 > b |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
8 |
hg add b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
383
diff
changeset
|
9 |
hg commit -m "commit #1" -d "0 0" |
383
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
10 |
hg co 0 |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
11 |
# B should disappear |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
12 |
ls |