← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_inv.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/workingtree_implementations/test_inv.py
137
137
        self.build_tree(['dir/', 'dir/child', 'other/'])
138
138
        wt.add(['dir', 'dir/child', 'other'],
139
139
               ['dir-id', 'child-id', 'other-id'])
140
 
        # this delta moves dir-id to dir2 and reparents 
 
140
        # this delta moves dir-id to dir2 and reparents
141
141
        # child-id to a parent of other-id
142
142
        wt.apply_inventory_delta([('dir', 'dir2', 'dir-id',
143
143
            inventory.InventoryDirectory('dir-id', 'dir2', root_id)),