[PATCH] Fix "no-update" option to clone -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix "no-update" option to clone From: Bryan O'Sullivan <bos@serpentine.com> Turn "no-update" (invalid Python identifier) into "noupdate". manifest hash: 1dfb3212b97531437d5a243813896c090a05d95a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwST1ywK+sNU5EO8RAvGnAJ9/RvohYRxpMTWkK6YCiF6r3U68FACeNRcr mE/NYJzVbijiLK9TwWm8QgQ= =w/KV -----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
grep -Ev ">>>|<<<" a
hg status