Rev 6014: Update the test name to avoid confusion. in file:///home/vila/src/bzr/reviews/merge-prefers-this-root/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/merge-prefers-this-root/

------------------------------------------------------------
revno: 6014
revision-id: v.ladeuil+lp at free.fr-20110707085833-xn1dd2zfieoyxxdj
parent: aaron at aaronbentley.com-20110706213716-y287nsvoyqr77oo5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: merge-prefers-this-root
timestamp: Thu 2011-07-07 10:58:33 +0200
message:
  Update the test name to avoid confusion.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_shelf_ui.py'
--- a/bzrlib/tests/test_shelf_ui.py	2011-06-13 14:44:22 +0000
+++ b/bzrlib/tests/test_shelf_ui.py	2011-07-07 08:58:33 +0000
@@ -302,7 +302,7 @@
         finally:
             tree.unlock()
 
-    def test_shelve_old_root_deleted(self):
+    def test_shelve_old_root_preserved(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree1.commit('add root')
         tree2 = self.make_branch_and_tree('tree2')
@@ -311,7 +311,7 @@
                                 from_revision=revision.NULL_REVISION)
         tree1.commit('Replaced root entry')
         # This is essentially assertNotRaises(InconsistentDelta)
-        # With testtools 0.99, it can be rewritten as:
+        # With testtools 0.9.9, it can be rewritten as:
         # with ExpectedException(AssertionError,
         #                        'InconsistentDelta not raised'):
         #     with ExpectedException(errors.InconsistentDelta, ''):