Rev 6017: Add news entry and further tweaks. 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: 6017
revision-id: v.ladeuil+lp at free.fr-20110707093406-aqne3jdrydt80t5r
parent: v.ladeuil+lp at free.fr-20110707090929-9fjheau8siasz3g8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: merge-prefers-this-root
timestamp: Thu 2011-07-07 11:34:06 +0200
message:
  Add news entry and further tweaks.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2011-07-07 09:09:29 +0000
+++ b/bzrlib/tests/test_merge.py	2011-07-07 09:34:06 +0000
@@ -153,8 +153,8 @@
         # Do a commit so there is something to merge
         other_tree.commit('add root to other')
         self.assertNotEquals(root_id_before_merge, other_tree.get_root_id())
-        wt.merge_from_branch(other_tree.branch, from_revision='null:',
-                             to_revision=other_tree.last_revision())
+        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_create_rename(self):

=== modified file 'bzrlib/tests/test_shelf_ui.py'
--- a/bzrlib/tests/test_shelf_ui.py	2011-07-07 08:58:33 +0000
+++ b/bzrlib/tests/test_shelf_ui.py	2011-07-07 09:34:06 +0000
@@ -305,11 +305,14 @@
     def test_shelve_old_root_preserved(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree1.commit('add root')
+        tree1_root_id = tree1.get_root_id()
         tree2 = self.make_branch_and_tree('tree2')
         rev2 = tree2.commit('add root')
+        self.assertNotEquals(tree1_root_id, tree2.get_root_id())
         tree1.merge_from_branch(tree2.branch,
                                 from_revision=revision.NULL_REVISION)
-        tree1.commit('Replaced root entry')
+        tree1.commit('merging in tree2')
+        self.assertEquals(tree1_root_id, tree1.get_root_id())
         # This is essentially assertNotRaises(InconsistentDelta)
         # With testtools 0.9.9, it can be rewritten as:
         # with ExpectedException(AssertionError,

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-07-06 14:54:53 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-07-07 09:34:06 +0000
@@ -142,10 +142,12 @@
   exception caused while running bzr serve.
   (Jonathan Riddell, #274578)
 
-
 * New hook set_commit_message in bzrlib.msgeditor to set a commit message
   and revision properties.  (Jonathan Riddell, #274578)
 
+* Preserve existing ``root-id`` when merging an unrelated branch.
+  (Aaron Bentley, #806356)
+
 * Support ``-S`` as an alias for ``--short`` for the ``log`` and
   ``missing`` commands. (Martin von Gagern, #38655)