[MERGE] Make dpush help/error a bit more generic

[Martin Pool]

2009/5/17 Jelmer Vernooij <jelmer at samba.org>:
> On Sun, May 17, 2009 at 11:36:29AM +0200, Martin Pool wrote:
>> 2009/5/16 Jelmer Vernooij <jelmer at vernstok.nl>:
>> > dpush' help and errors currently suggest that dpush is useful when
>> > pushing into foreign branches, while in fact it's only useful to push
>> > between branches in different vcs'es. bzr-git now supports pushing
>> > from local into remote git branches and, since there is no conversion
>> > necessary there, the current dpush descriptions are a bit confusing.
>
>> > The attached patch fixes the dpush help/error.
>> BB: tweak
>
>> Would "not necessary" be more better than "not possible"?
>
>> Could I persuade you to think about changing the command to push --lossy?
> I'm slowly getting used to the idea. We need to figure out what to do
> with the --no-rebase option that exists for dpush in that case. What
> about?
>
> bzr push --lossy                        (now: bzr dpush --no-rebase)
> bzr push --lossy --rebase       (now: bzr dpush)

I think that's reasonable; I'd probably also be ok with it defaulting
to --rebase but that seems more dangerous.  Either way, it's different
from the postconditions that normally hold for push, but I think
people will still see the conceptual operation as being the same.

-- 
Martin <http://launchpad.net/~mbp/>