tests/test-merge3
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 19 Jul 2005 07:00:03 -0800
changeset 725 c6b912f8b5b2
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Merge with Matt's tip.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/sh -x
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     2
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     3
hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     4
echo This is file a1 > a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     5
hg add a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     6
hg commit -t "commit #0" -d "0 0" -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     7
touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     8
hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     9
rm b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
    10
hg commit -A -t"comment #1" -d "0 0" -u user