Rev 3951: Cleanup. in lp:~bzr/bzr/1.12-lca-deleted

[Vincent Ladeuil]

At lp:~bzr/bzr/1.12-lca-deleted

------------------------------------------------------------
revno: 3951
revision-id: v.ladeuil+lp at free.fr-20090122133817-cerv5t33wgw2m5qj
parent: v.ladeuil+lp at free.fr-20090121103302-tx6xsuogm6kga9jt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: spurious-conflicts
timestamp: Thu 2009-01-22 14:38:17 +0100
message:
  Cleanup.
  
  * bzrlib/tests/test_merge.py:
  (TestMergerEntriesLCA.test_not_in_other_or_lca,
  TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2):
  Delete useless vars.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2009-01-20 18:13:50 +0000
+++ b/bzrlib/tests/test_merge.py	2009-01-22 13:38:17 +0000
@@ -1428,7 +1428,6 @@
         merge_obj = self.make_merge_obj(builder, 'E-id')
 
         entries = list(merge_obj._entries_lca())
-        root_id = 'a-root-id'
         self.assertEqual([], entries)
 
     def test_not_in_other_mod_in_lca1_not_in_lca2(self):
@@ -1459,7 +1458,6 @@
         merge_obj = self.make_merge_obj(builder, 'E-id')
 
         entries = list(merge_obj._entries_lca())
-        root_id = 'a-root-id'
         self.assertEqual([('foo-id', True,
                            ((root_id, [root_id, None]), None, root_id),
                            ((u'foo', [u'foo', None]), None, 'foo'),