← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
88
88
 
89
89
 
90
90
def resolve(tree, paths=None, ignore_misses=False):
91
 
    tree.lock_write()
 
91
    tree.lock_tree_write()
92
92
    try:
93
93
        tree_conflicts = tree.conflicts()
94
94
        if paths is None: