hg addremove: take optional files list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg addremove: take optional files list From: Chris Mason <mason@suse.com> Change hg addremove so that it can take a list of files to process instead of searching the entire tree for candidates. manifest hash: 592d8771ea5703dd6ed4459239dab84e15ee9321 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGyqywK+sNU5EO8RAt0jAKCSDQ1fxgQNP08kehdxlQwX5DUuuQCgqRB2 7gZoRNyJmOy5BVp6VBmUJbw= =THQB -----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