##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

[PATCH] Removal of a file added by merging branches...
[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----
mpm@selenic.com - - Load All Authors

File last commit:

r383:4862a134 default
r416:5e9e8b8d default
Show More
test-backwards-remove
12 lines | 208 B | text/plain | TextLexer
/ tests / test-backwards-remove
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh -x
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
ls
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
hg co 0
# B should disappear
ls