/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: 2007-12-20 14:28:59 UTC
  • mto: This revision was merged to the branch mainline in revision 3135.
  • Revision ID: abentley@panoramicfeedback.com-20071220142859-9tea7c02aw13w54k
Update docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1335
1335
    - Otherwise, if the content on disk matches the content we are building,
1336
1336
      it is silently replaced.
1337
1337
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
 
1338
 
 
1339
    :param tree: The tree to convert wt into a copy of
 
1340
    :param wt: The working tree that files will be placed into
 
1341
    :param accelerator_tree: A tree which can be used for retrieving file
 
1342
        contents more quickly than tree itself, i.e. a workingtree.  tree
 
1343
        will be used for cases where accelerator_tree's content is different.
1338
1344
    """
1339
1345
    wt.lock_tree_write()
1340
1346
    try: