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

[Russel Winder]

On Sun, 2009-05-17 at 16:54 +0200, Jelmer Vernooij wrote:

> 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)

If you are giving way then I guess the end is at hand, and I will just
have to accept it ;-)

However, one last time :  I am very worried about the push and dpush
operations using the same command since they have very different
consequences for the source as well as destination branches (when a
rebase happens).  They do seem to me like different commands, not
variants of the same command.  However the general feeling appears to be
to go for options. So be it, I can live with it.

I guess the problem that really needs a bit of airing is how to deal
with the case where a dpush is (or the options to push are) used when a
traditional push should have been used and vice versa.  The two cases
are:

1.  A Subversion repository holding a Bazaar branch.  Traditional push
should always be used since all the metadata is in the repository.  What
happens if dpush is used?  Is there a way of recovering from the rebase
if it happens.  Is there a way of re-adding the appropriate metadata
afterwards?  Perhaps the command should check back with the user that
this is really what they want?

2.  A Subversion repository that has no metadata.  "lossy push" should
always be used on this repository otherwise lots of metadata will be
added and this might annoy all the Subversion and Git users.  Indeed
"lossy rebasing push" should probably always be used.  Again perhaps
there needs to be some form of check that if traditional push is used on
a repository with no metadata a request for confirmation with the user
is undertaken.

-- 
Russel.
============================================================
Dr Russel Winder                 Partner

Concertant LLP          t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,     f: +44 8700 516 084    voip:  sip:russel.winder at ekiga.net
London SW11 1EN, UK.    m: +44 7770 465 077    xmpp: russel at russel.org.uk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090518/3c2189f0/attachment.pgp