Viewing all changes in revision 3948.1.4.
- Committer: Vincent Ladeuil
- Date: 2009-01-23 09:53:03 UTC
- mto: (3954.1.2 bzr.integration) (3966.1.1 bzr.integration)
- mto: This revision was merged to the branch mainline in revision 3955.
- Revision ID: v.ladeuil+lp@free.fr-20090123095303-gvzd86p6p2ytmhxz
More cleanup and fix overzealous previous one.
* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCA.test_file_not_in_one_lca,
TestMergerEntriesLCA.test_only_in_one_lca,
TestMergerEntriesLCA.test_same_lca_resolution_one_side_updates_content,
TestMergerEntriesLCA.test_this_changed_kind): Delete useless vars.
(TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2):
But not there !.
* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCA.test_file_not_in_one_lca,
TestMergerEntriesLCA.test_only_in_one_lca,
TestMergerEntriesLCA.test_same_lca_resolution_one_side_updates_content,
TestMergerEntriesLCA.test_this_changed_kind): Delete useless vars.
(TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2):
But not there !.
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
