← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

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