author | Bryan O'Sullivan <bos@serpentine.com> |
Wed, 10 Aug 2005 12:36:34 -0800 | |
changeset 882 | bc9ca4d51d23 |
parent 814 | 0902ffece4b4 |
child 925 | 5a034646e472 |
permissions | -rw-r--r-- |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
1 |
+ hg init |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
2 |
+ hg add a |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
3 |
+ 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
|
4 |
+ hg add b |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
5 |
+ 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
|
6 |
+ hg update 0 |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
7 |
+ hg add c |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
8 |
+ 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
|
9 |
+ hg update -m 1 |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
10 |
+ hg commit -m commit #3 -d 0 0 |