##// 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:

r414:291a6284 default
r416:5e9e8b8d default
Show More
test-flags
33 lines | 378 B | text/plain | TextLexer
/ tests / test-flags
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh +ex
mkdir test1
cd test1
hg init
touch a b
hg add a b
hg ci -t "added a b" -u test -d "0 0"
cd ..
mkdir test2
cd test2
hg init
hg merge ../test1
hg co
chmod +x a
hg ci -t "chmod +x a" -u test -d "0 0"
cd ../test1
echo 123 >>a
hg ci -t "a updated" -u test -d "0 0"
hg merge ../test2
hg heads
hg history
hg -dv co -m
ls -l ../test[12]/a > foo
cut -b 0-10 < foo