/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/tests/per_workingtree/test_move.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-16 08:42:21 UTC
  • mfrom: (5777.6.11 commit-lossy)
  • mto: This revision was merged to the branch mainline in revision 5792.
  • Revision ID: jelmer@samba.org-20110416084221-g9kgp1j4o9zo0kk4
merge commit-lossy

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_move.py
174
174
                               ('b/c', 'c-id')], tree)
175
175
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
176
176
                               ('b/c', 'c-id')], tree.basis_tree())
177
 
        self.failIfExists('a')
 
177
        self.assertPathDoesNotExist('a')
178
178
        self.assertFileEqual(a_contents, 'b/a')
179
179
        tree._validate()
180
180
 
191
191
                               ('c', 'c-id')], tree)
192
192
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
193
193
                               ('b/c', 'c-id')], tree.basis_tree())
194
 
        self.failIfExists('b/c')
 
194
        self.assertPathDoesNotExist('b/c')
195
195
        self.assertFileEqual(c_contents, 'c')
196
196
        tree._validate()
197
197
 
210
210
            self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
211
211
                                   ('c', 'c-id')], tree)
212
212
        else:
213
 
            self.failUnlessExists('b/c')
 
213
            self.assertPathExists('b/c')
214
214
            self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
215
215
                                   ('b/c', 'c-id')], tree)
216
216
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),