← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
265
265
    return delta
266
266
 
267
267
 
268
 
class ChangeReporter(object):
 
268
class _ChangeReporter(object):
269
269
    """Report changes between two trees"""
270
270
 
271
271
    def __init__(self, output=None, suppress_root_add=True,
379
379
    Unfortunately, some tree-changing operations are very complex
380
380
    :change_iterator: an iterator or sequence of changes in the format
381
381
        generated by Tree._iter_changes
382
 
    :param reporter: The ChangeReporter that will report the changes.
 
382
    :param reporter: The _ChangeReporter that will report the changes.
383
383
    """
384
384
    versioned_change_map = {
385
385
        (True, True)  : 'unchanged',