[Merge] Suggest pull when asked to merge into an empty branch

[Wouter van Heyst]

On Thu, Feb 01, 2007 at 04:32:13PM +1100, Martin Pool wrote:
> On 31 Jan 2007, Henry Ludemann <misc at hl.id.au> wrote:
> > Suggest pull when asked to merge into an empty branch.
> > 
> > Merging to an empty tree fails (see bug 82555 for testcase and attempted
> > fixes).
> > 
> > This is just a bundle that suggests to the user that 'pull' might be a
> > better option...
> 
> Hello
> 
> Thankyou for the analysis in the bug report.
> 
> I think giving this message would be a good first step.  Is this the
> best place for the change though?  It seems a bit redundant with the
> check which is already done inside merge.  If it's an interim fix it's
> maybe ok.

That, and what about suggesting 'merge --pull' instead of 'pull'? What
do we want to advocate?

Wouter van Heyst
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070201/5b6f75e7/attachment.pgp