← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-09-22 03:23:22 UTC
  • mto: (1185.1.37)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050922032322-345dab5d05a96893
Fixed non-tree-root bug in branch, revert, merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
134
134
            
135
135
def get_tree(treespec, temp_root, label, local_branch=None):
136
136
    location, revno = treespec
137
 
    branch = Branch.open(location)
 
137
    branch = Branch.open_containing(location)
138
138
    if revno is None:
139
139
        revision = None
140
140
    elif revno == -1: