~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_add.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:
148
148
                          tree.add, ['dir/subdir'])
149
149
 
150
150
    def test_add_root(self):
151
 
        # adding the root should be a no-op, or at least not 
 
151
        # adding the root should be a no-op, or at least not
152
152
        # do anything whacky.
153
153
        tree = self.make_branch_and_tree('.')
154
154
        tree.lock_write()