[PATCH] add type selection to merge

[Aaron Bentley]

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

Martin Pool wrote:
> On 29 Jul 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> 
>>Building on my previous patches, this patch adds the ability to select
>>the type of merge on the commandline.
> 
> 
> Could you please put up a branch with all of these so I can see them
> together?

Sure thing: http://panoramicfeedback.com/opensource/bzr.24/

> What was we should probably do is make the Command.__init__ function
> not run the command, but just construct the object.  That should clean
> up ExternalCommand too.  Then the command can have a help() method
> which by default returns the docstring but can do something more
> complex for commands that depend on dynamically loaded features.

That sounds good.

> I think that (and --version) was broken by the master_options stuff.
> I have (imo) cleaned that up so that only --no-plugins, --profile and
> --builtin are handled specially.  These ones must occur before the
> command and before any other options, because the affect how the rest
> of the line will be affected.  That allows us to have plugins that use
> nonstandard options without them needing to modify global tables.

Cool.

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

iD8DBQFC6oib0F+nu1YWqI0RApweAJ9U+C/HrrMlFxb8eEzlXBFWhANAdQCfT8rf
nd/tcVATFnaLyyE6879avRM=
=b71B
-----END PGP SIGNATURE-----