← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Jelmer Vernooij
  • Date: 2005-10-19 09:34:39 UTC
  • mfrom: (1185.16.78)
  • mto: (1185.16.102)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: jelmer@samba.org-20051019093439-e1d8e3508d1ba46b
Merge from Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
199
199
            
200
200
def get_tree(treespec, local_branch=None):
201
201
    location, revno = treespec
202
 
    branch = Branch.open_containing(location)
 
202
    branch = Branch.open_containing(location)[0]
203
203
    if revno is None:
204
204
        revision = None
205
205
    elif revno == -1:
264
264
    try:
265
265
        if this_dir is None:
266
266
            this_dir = '.'
267
 
        this_branch = Branch.open_containing(this_dir)
 
267
        this_branch = Branch.open_containing(this_dir)[0]
268
268
        this_rev_id = this_branch.last_revision()
269
269
        if this_rev_id is None:
270
270
            raise BzrCommandError("This branch has no commits")