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

  • Committer: Martin Pool
  • Date: 2005-07-18 14:28:13 UTC
  • Revision ID: mbp@sourcefrog.net-20050718142813-253ec02b9636bd98
- add stubbed-out test for clashing replace and delete

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
32
32
        If set, write to this file (default stdout.)
33
33
    """
34
34
    import sys
35
 
    from bzrlib.delta import compare_trees
 
35
    from bzrlib.diff import compare_trees
36
36
 
37
37
    if to_file == None:
38
38
        to_file = sys.stdout