← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-07 09:34:06 UTC
  • mto: (6011.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6012.
  • Revision ID: v.ladeuil+lp@free.fr-20110707093406-aqne3jdrydt80t5r
Add news entry and further tweaks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
153
153
        # Do a commit so there is something to merge
154
154
        other_tree.commit('add root to other')
155
155
        self.assertNotEquals(root_id_before_merge, other_tree.get_root_id())
156
 
        wt.merge_from_branch(other_tree.branch, from_revision='null:',
157
 
                             to_revision=other_tree.last_revision())
 
156
        wt.merge_from_branch(other_tree.branch,
 
157
                             from_revision=_mod_revision.NULL_REVISION)
158
158
        self.assertEqual(root_id_before_merge, wt.get_root_id())
159
159
 
160
160
    def test_create_rename(self):