Magic shared upstream merged logic should be optional

[Max Bowsher]

Current bzr-builddeb has wired the special upstream handling that used to be invoked via 'bzr merge-package' directly into 'bzr merge'. Often that's what you want. But not always. There should be a command line switch to opt out of it.

(Use case when it is unhelpful: merging a new upstream version back through a set of precise->oneiric->natty->maverick->lucid branches for a PPA. The behaviour creates unnecessary criss-cross and prevents conflict resolution done once from carrying over cleanly to the later branches.)

[James Westby (james-w)]

Agreed.

I don't know how easy it is for a plugin to add an option to a command it is hooking,
but doing it via overriding, or through an environment variable or something
is probably possible.

Thanks,

James