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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
285
285
            (i.e. when a tree has just been initted)
286
286
        :param output_file: If supplied, a file-like object to write to.
287
287
            Only one of output and output_file may be supplied.
288
 
        :param unversioned_filter: A filter function to be called on 
 
288
        :param unversioned_filter: A filter function to be called on
289
289
            unversioned files. This should return True to ignore a path.
290
290
            By default, no filtering takes place.
291
291
        :param view_info: A tuple of view_name,view_files if only