← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2007-08-15 11:24:06 UTC
  • mfrom: (2702 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2703.
  • Revision ID: aaron.bentley@utoronto.ca-20070815112406-lyv23omlm0wgsu42
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
34
34
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
35
35
                            delete_any)
36
36
from bzrlib.progress import DummyProgress, ProgressPhase
37
 
from bzrlib.symbol_versioning import deprecated_function, zero_fifteen, \
38
 
        zero_nineteen
 
37
from bzrlib.symbol_versioning import (
 
38
        deprecated_function,
 
39
        zero_fifteen,
 
40
        zero_ninety,
 
41
        )
39
42
from bzrlib.trace import mutter, warning
40
43
from bzrlib import tree
41
44
import bzrlib.ui
1425
1428
        working_tree.unlock()
1426
1429
 
1427
1430
 
1428
 
@deprecated_function(zero_nineteen)
 
1431
@deprecated_function(zero_ninety)
1429
1432
def change_entry(tt, file_id, working_tree, target_tree, 
1430
1433
                 trans_id_file_id, backups, trans_id, by_parent):
1431
1434
    """Replace a file_id's contents with those from a target tree."""