options: kill -d for debug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 options: kill -d for debug You must now use --debug. This is a preparatory step for changing the option parsing from: hg [global-opts] <command> [command-opts] to hg [global-opts] <command> [global or command opts] manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK kaTSSodACgPzgbFiid5RL4Y= =siEe -----END PGP SIGNATURE-----

--- a/tests/test-up-local-change
+++ b/tests/test-up-local-change
@@ -26,8 +26,8 @@ hg commit -t "2" -u test -d "0 0"
 cd ../r2
 hg -q pull ../r1
 hg status
-hg -d up
-hg -d up -m
+hg --debug up
+hg --debug up -m
 hg parents
 hg -v history
 hg diff > ../d