/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/conflicts.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-13 01:57:42 UTC
  • mfrom: (2003 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2004.
  • Revision ID: john@arbash-meinel.com-20060913015742-26daf2a7676b904e
[merge] bzr.dev 2003

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: