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

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Henry Ludemann 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...

What about this patch instead. Rather than checking early it just does
the check at the same time as the existing check. It just changes the
error message.


With the patch I now get:
% bzr merge ../test-bzr
bzr: ERROR: This branch has no commits. (perhaps you would prefer 'bzr
pull')

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFwgo2JdeBCYSNAAMRAndWAKDU4G4IlylvcpUxXte1MYg5dw4urwCgpERT
JPUqBTwXEWY0MpKjTwK0nuc=
=lv7K
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: no-commits-errors.patch
Type: text/x-patch
Size: 1223 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070201/1ba941fc/attachment.bin