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

[Jelmer Vernooij]

On Mon, May 18, 2009 at 08:25:35AM +0100, Russel Winder wrote:
> On Sun, 2009-05-17 at 16:54 +0200, Jelmer Vernooij wrote:

> 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.
I don't see any reason why you would always want to use lossy push in
this situation. The metadata is only visible to Subversion
users who are using file properties, in other words who are using
Subversion < 1.5 on client and server. 

In all other cases the metadata is stored in places that aren't visible 
to the user. I don't think we should be designing the UI for the shrinking 
group (as everybody slowly upgrades) of Subversion < 1.5 users.

Cheers,

Jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - http://jelmer.vernstok.nl/