| author | Thomas Arendsen Hein <thomas@intevation.de> |
| Fri, 29 Jul 2005 06:43:21 +0100 | |
| changeset 793 | 445970ccf57a |
| parent 749 | 7e4843b7efd2 |
| child 800 | ec85f9e6f3b1 |
| child 808 | 8f5637f0a0c0 |
| child 814 | 0902ffece4b4 |
| permissions | -rwxr-xr-x |
|
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
1 |
#!/bin/sh -x |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
2 |
|
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
3 |
hg init |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
4 |
echo This is file a1 > a |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
5 |
hg add a |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
416
diff
changeset
|
6 |
hg commit -m "commit #0" -d "0 0" |
|
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
7 |
echo This is file b1 > b |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
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:
416
diff
changeset
|
9 |
hg commit -m "commit #1" -d "0 0" |
|
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
10 |
hg update 0 |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
11 |
echo This is file c1 > c |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
12 |
hg add c |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
416
diff
changeset
|
13 |
hg commit -m "commit #2" -d "0 0" |
|
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
14 |
hg update -m 1 |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
15 |
rm b |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
16 |
echo This is file c22 > c |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
416
diff
changeset
|
17 |
hg commit -m "commit #3" -d "0 0" |