hg commit: add -A flag
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg commit: add -A flag
From: Chris Mason <mason@suse.com>
Add hg commit -A that calls hg addremove before trying to run the commit
manifest hash: d25cb3ab4e0dc2e8642bcbef32da4ab178cd4823
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsGzrywK+sNU5EO8RAvdFAJ46ZjyACMvKEUq8RmdxZB9ZE0z6ygCfYYzq
UP2EXTOQ2pdhxKFyad8h/Rg=
=wzZD
-----END PGP SIGNATURE-----
#!/bin/bash
set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
cat a | grep -v ">>>" | grep -v "<<<"
hg status