sapling/tests/test-merge3.out
mpm@selenic.com 11f489a590 [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-----
2005-06-21 17:50:37 -08:00

10 lines
182 B
Plaintext

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-tcomment #1' -d '0 0' -u user
b never committed!