← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-17 00:32:27 UTC
  • mfrom: (4606.2.1 test-foreign)
  • Revision ID: pqm@pqm.ubuntu.com-20090817003227-g813yyjlq47j9qyb
(robertc) Prepare test_foreign for rich roots as the default format.
        (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
309
309
        self.build_tree_contents([('br1/bla', 'original contents\n')])
310
310
        wt.add('bla', 'bla-a')
311
311
        wt.commit('bla-a')
 
312
        root_id = wt.get_root_id()
312
313
        target = wt.bzrdir.sprout('br2').open_workingtree()
313
314
        target.unversion(['bla-a'])
314
315
        target.add('bla', 'bla-b')
319
320
        foreign.update_workingtree_fileids(wt, target_basis)
320
321
        wt.lock_read()
321
322
        try:
322
 
            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
 
323
            self.assertEquals([root_id, "bla-b"], list(wt.inventory))
323
324
        finally:
324
325
            wt.unlock()
325
326