Rev 6018: Change test order to get a better diff. 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: 6018
revision-id: v.ladeuil+lp at free.fr-20110707100439-lo1bvs3f2smjpjav
parent: v.ladeuil+lp at free.fr-20110707093406-aqne3jdrydt80t5r
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: merge-prefers-this-root
timestamp: Thu 2011-07-07 12:04:39 +0200
message:
  Change test order to get a better diff.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2011-07-07 09:34:06 +0000
+++ b/bzrlib/tests/test_merge.py	2011-07-07 10:04:39 +0000
@@ -135,28 +135,29 @@
             preview = tt.get_preview_tree()
             self.assertEqual(wt.get_root_id(), preview.get_root_id())
 
-    def test_merge_preview_unrelated_retains_root(self):
-        wt = self.make_branch_and_tree('tree')
-        other_tree = self.make_branch_and_tree('other')
-        other_tree.commit('add root in other')
-        merger = _mod_merge.Merge3Merger(wt, wt, wt.basis_tree(), other_tree,
-                                         this_branch=wt.branch,
-                                         do_merge=False)
-        with merger.make_preview_transform() as tt:
-            preview = tt.get_preview_tree()
-            self.assertEqual(wt.get_root_id(), preview.get_root_id())
-
     def test_merge_unrelated_retains_root(self):
         wt = self.make_branch_and_tree('tree')
         root_id_before_merge = wt.get_root_id()
         other_tree = self.make_branch_and_tree('other')
         # Do a commit so there is something to merge
-        other_tree.commit('add root to other')
+        other_tree.commit('commit other')
         self.assertNotEquals(root_id_before_merge, other_tree.get_root_id())
         wt.merge_from_branch(other_tree.branch,
                              from_revision=_mod_revision.NULL_REVISION)
         self.assertEqual(root_id_before_merge, wt.get_root_id())
 
+    def test_merge_preview_unrelated_retains_root(self):
+        wt = self.make_branch_and_tree('tree')
+        other_tree = self.make_branch_and_tree('other')
+        # Do a commit so there is something to merge
+        other_tree.commit('commit other')
+        merger = _mod_merge.Merge3Merger(wt, wt, wt.basis_tree(), other_tree,
+                                         this_branch=wt.branch,
+                                         do_merge=False)
+        with merger.make_preview_transform() as tt:
+            preview = tt.get_preview_tree()
+            self.assertEqual(wt.get_root_id(), preview.get_root_id())
+
     def test_create_rename(self):
         """Rename an inventory entry while creating the file"""
         tree =self.make_branch_and_tree('.')