/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Update with new parent-ids patch.

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)
516
518
            if file_id not in tree:
517
519
                return (None, None)
518
520
            kind = tree.kind(file_id)
519
 
            if kind == "root_directory":
520
 
                kind = "directory"
521
521
            if kind == "file":
522
522
                contents = tree.get_file_sha1(file_id)
523
523
            elif kind == "symlink":