← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jonathan Riddell
  • Date: 2011-05-16 17:31:08 UTC
  • mto: This revision was merged to the branch mainline in revision 5897.
  • Revision ID: jriddell@canonical.com-20110516173108-7vd2h6c7bof88tct
https://launchpad.net/bugs/242175
add an error message when merging into empty branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3945
3945
        merger = None
3946
3946
        allow_pending = True
3947
3947
        verified = 'inapplicable'
 
3948
 
3948
3949
        tree = WorkingTree.open_containing(directory)[0]
 
3950
        if tree.branch.revno() == 0:
 
3951
            raise errors.BzrCommandError('Merging into empty branches not currently supported, '
 
3952
                                         'https://bugs.launchpad.net/bzr/+bug/308562')
3949
3953
 
3950
3954
        try:
3951
3955
            basis_tree = tree.revision_tree(tree.last_revision())