~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit.py

Merged Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
196
196
        b.move(['hello'], 'a')
197
197
        r2 = 'test@rev-2'
198
198
        b.commit('two', rev_id=r2, allow_pointless=False)
199
 
        self.check_inventory_shape(b.inventory,
 
199
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
200
200
                                   ['a', 'a/hello', 'b'])
201
201
 
202
202
        b.move(['b'], 'a')
203
203
        r3 = 'test@rev-3'
204
204
        b.commit('three', rev_id=r3, allow_pointless=False)
205
 
        self.check_inventory_shape(b.inventory,
 
205
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
206
206
                                   ['a', 'a/hello', 'a/b'])
207
207
        self.check_inventory_shape(b.get_revision_inventory(r3),
208
208
                                   ['a', 'a/hello', 'a/b'])
211
211
               os.sep.join(['a', 'b']))
212
212
        r4 = 'test@rev-4'
213
213
        b.commit('four', rev_id=r4, allow_pointless=False)
214
 
        self.check_inventory_shape(b.inventory,
 
214
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
215
215
                                   ['a', 'a/b/hello', 'a/b'])
216
216
 
217
217
        inv = b.get_revision_inventory(r4)