← 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: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

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(set([root_id, "bla-b"]), set(wt.inventory))
323
324
        finally:
324
325
            wt.unlock()
325
326