Rev 4623: Prepare dirstate tests for 2a as default. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4623
revision-id: robertc at robertcollins.net-20090817033356-sgmkyhky3y0zayqw
parent: robertc at robertcollins.net-20090816222320-kv65zaaie2ngo0ng
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Mon 2009-08-17 13:33:56 +1000
message:
  Prepare dirstate tests for 2a as default.
=== modified file 'bzrlib/tests/test_dirstate.py'
--- a/bzrlib/tests/test_dirstate.py	2009-07-15 01:13:20 +0000
+++ b/bzrlib/tests/test_dirstate.py	2009-08-17 03:33:56 +0000
@@ -419,7 +419,7 @@
             (('', '', tree.get_root_id()), # common details
              [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
               ('d', '', 0, False, rev_id), # first parent details
-              ('d', '', 0, False, rev_id2), # second parent details
+              ('d', '', 0, False, rev_id), # second parent details
              ])])
         state = dirstate.DirState.from_tree(tree, 'dirstate')
         self.check_state_with_reopen(expected_result, state)
@@ -500,7 +500,7 @@
             (('', '', tree.get_root_id()), # common details
              [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
               ('d', '', 0, False, rev_id), # first parent details
-              ('d', '', 0, False, rev_id2), # second parent details
+              ('d', '', 0, False, rev_id), # second parent details
              ]),
             (('', 'a file', 'a-file-id'), # common
              [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
@@ -1000,7 +1000,7 @@
                 [(('', '', root_id), [
                   ('d', '', 0, False, dirstate.DirState.NULLSTAT),
                   ('d', '', 0, False, revid1),
-                  ('d', '', 0, False, revid2)
+                  ('d', '', 0, False, revid1)
                   ])],
                 list(state._iter_entries()))
         finally:
@@ -1034,7 +1034,7 @@
             (('', '', root_id), [
              ('d', '', 0, False, dirstate.DirState.NULLSTAT),
              ('d', '', 0, False, revid1.encode('utf8')),
-             ('d', '', 0, False, revid2.encode('utf8'))
+             ('d', '', 0, False, revid1.encode('utf8'))
              ]),
             (('', 'a file', 'file-id'), [
              ('a', '', 0, False, ''),