Commit Graph

4 Commits

Author SHA1 Message Date
mpm@selenic.com
c6129ace2e 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-----
2005-07-02 22:54:35 -08:00
Thomas Arendsen Hein
51ae3ccedf Remove bashisms and use /bin/sh instead of /bin/bash.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Remove bashisms and use /bin/sh instead of /bin/bash.

manifest hash: 25560e04ff8ac33a6d8b82d2328b4e90578bee4c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCxOEjW7P1GVgWeRoRAm9XAJ9IjlbMerPYEhKQQu7Ufcm6630cDwCfdXJ3
865XH6YVMuCYNjf3eibwQaM=
=r3gh
-----END PGP SIGNATURE-----
2005-07-01 07:22:27 +01:00
mpm@selenic.com
fedc819459 Tidy up conflict and pull tests
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Tidy up conflict and pull tests

Fix failure to kill hg serve process and pipeline ordering with set -e

manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg
pI3IH2BvqUlckdLwx3M5jcQ=
=s/QA
-----END PGP SIGNATURE-----
2005-06-17 08:50:55 -08:00
mpm@selenic.com
92f8f94e43 merge3: fix argument order
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

merge3: fix argument order

We were passing the wrong argument order to hgmerge. Add a merge
conflict test case.

manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF
ooZT2fyN3tL3uVM2YP8KcA==
=O4fE
-----END PGP SIGNATURE-----
2005-06-15 00:27:20 -08:00