← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_cat.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/tests/blackbox/test_cat.py
79
79
        try:
80
80
            tree.add(['a-rev-tree', 'c-rev', 'd-rev'])
81
81
            tree.commit('add test files')
82
 
            # remove currently uses self._write_inventory - 
 
82
            # remove currently uses self._write_inventory -
83
83
            # work around that for now.
84
84
            tree.flush()
85
85
            tree.remove(['d-rev'])