tests/test-merge3
author mpm@selenic.com
Tue, 21 Jun 2005 17:50:37 -0800
changeset 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
[PATCH] (3/4) Removing an added file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] (3/4) Removing an added file From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Here's an hg changeset that deals with "hg add"ing and then "hg remove"ing a file without ever committing it. Previously, this caused a python exception at commit time. Test case included in the patch. manifest hash: 4d012f3f8b1aa664fed9e8bc2849931b28728acd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMPtywK+sNU5EO8RAuxMAKCmeMLqOUBmUfCfbQgYOAysOvKkwgCfcJai 2My0M7KqhwnJSbZXbGIOcow= =N7N0 -----END PGP SIGNATURE-----
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