[MERGE] command defaults

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> First about your patch:
> 
> === modified file 'bzrlib/tests/test_config.py'
> --- bzrlib/tests/test_config.py   
> +++ bzrlib/tests/test_config.py   
> @@ -32,7 +32,10 @@
>                        "email=Robert Collins <robertc at example.com>\n"
>                        "editor=vim\n"
>                        "gpg_signing_command=gnome-gpg\n"
> -                      "user_global_option=something\n")
> +                      "user_global_option=something\n"
> +                      "[COMMAND_DEFAULTS]\n"
> +                      'commit=-m "log message" #evil? possibly.\n'
> +                      'merge=--merge-type "weave')
> 
>                                            ^     ^
> Probably first double quote is unnecessary or should be matching quote
> after word `weave`?

That is a deliberate syntax error so that I can test syntax error
handling.  I guess I could separate it out.

> 
> Second about broken test:
> blackbox.test_too_much.TestCommands.test_external_command         FAIL

Thanks for the report.  That test doesn't seem to run on my box.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD4Ryp0F+nu1YWqI0RAuKuAJ0U3QNhBa2Oq+4cO0f86FRL+EnfBgCghHAX
6923L0YBr4/UNHy81ed+W2M=
=QPZQ
-----END PGP SIGNATURE-----