Rev 2250: Mention using 'bzr pull' if there are no commits in current branch in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/no-commits-errors

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/no-commits-errors

------------------------------------------------------------
revno: 2250
revision-id: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no-commits-errors
timestamp: Thu 2007-02-01 09:40:07 -0600
message:
  Mention using 'bzr pull' if there are no commits in current branch
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2007-01-31 03:51:36 +0000
+++ b/bzrlib/merge.py	2007-02-01 15:40:07 +0000
@@ -141,7 +141,8 @@
 
     def check_basis(self, check_clean, require_commits=True):
         if self.this_basis is None and require_commits is True:
-            raise BzrCommandError("This branch has no commits")
+            raise BzrCommandError("This branch has no commits."
+                                  " (perhaps you would prefer 'bzr pull')")
         if check_clean:
             self.compare_basis()
             if self.this_basis != self.this_rev_id: