# Bazaar revision bundle v0.8
#
# message:
#   Don't allow merging to an empty branch (suggest bzr pull).
# committer: Henry Ludemann <henry@munchkin>
# date: Sun 2007-01-28 17:27:22.520999908 +0000

=== modified file bzrlib/builtins.py
--- bzrlib/builtins.py
+++ bzrlib/builtins.py
@@ -3043,6 +3043,10 @@
                                      " type %s." % merge_type)
     if reprocess and show_base:
         raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
+
+    if this_tree.branch.revno() == 0:
+        raise errors.BzrCommandError("Cannot merge to an empty branch. Use bzr pull.")
+
     try:
         merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
                                    pb=pb)

=== modified directory  // last-changed:henry@munchkin-20070128172722-r15n3w1fb
... 7h7esg6
# revision id: henry@munchkin-20070128172722-r15n3w1fb7h7esg6
# sha1: 4d73c4a6da6b43788fbd88984f65b3411f30c2b9
# inventory sha1: b8b23b9abb3f16643c1b30ad0f0f1de1b01a8fbf
# parent ids:
#   henry@munchkin-20070127095535-ot6q1cwzo00g1tfn
# base id: henry@munchkin-20070127095535-ot6q1cwzo00g1tfn
# properties:
#   branch-nick: bzr.suggest_pull