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

  • Committer: Aaron Bentley
  • Date: 2008-08-28 23:43:12 UTC
  • mto: (3363.12.4 paths2ids)
  • mto: This revision was merged to the branch mainline in revision 3663.
  • Revision ID: aaron@aaronbentley.com-20080828234312-er64c3v3pqretd74
_alter_files locks supplied basis_tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
2147
2147
        working_tree.set_merge_modified(merge_modified)
2148
2148
    finally:
2149
2149
        target_tree.unlock()
 
2150
        target_tree.unlock()
2150
2151
        tt.finalize()
2151
2152
        pb.clear()
2152
2153
    return conflicts
2178
2179
 
2179
2180
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2180
2181
                 backups, merge_modified, basis_tree=None):
 
2182
    if basis_tree is not None:
 
2183
        basis_tree.lock_read()
2181
2184
    change_list = target_tree.iter_changes(working_tree,
2182
2185
        specific_files=specific_files, pb=pb)
2183
2186
    if target_tree.get_root_id() is None: