← 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: 2006-08-09 16:42:10 UTC
  • mto: This revision was merged to the branch mainline in revision 1911.
  • Revision ID: abentley@panoramicfeedback.com-20060809164210-3945898670a299ca
Merge takes --uncommitted parameter

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
50
50
# TODO: Report back as changes are merged in
51
51
 
52
52
def _get_tree(treespec, local_branch=None):
 
53
    from bzrlib import workingtree
53
54
    location, revno = treespec
 
55
    if revno is None:
 
56
        tree = workingtree.WorkingTree.open_containing(location)[0]
 
57
        return tree.branch, tree
54
58
    branch = Branch.open_containing(location)[0]
55
 
    if revno is None:
56
 
        revision = None
57
 
    elif revno == -1:
 
59
    if revno == -1:
58
60
        revision = branch.last_revision()
59
61
    else:
60
62
        revision = branch.get_rev_id(revno)