← 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: Robert Collins
  • Date: 2007-07-25 00:52:21 UTC
  • mfrom: (2650 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2651.
  • Revision ID: robertc@robertcollins.net-20070725005221-0ysm6il5mqnme3wz
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
270
270
            tree_b.merge_from_branch(tree_a.branch)
271
271
        except AttributeError:
272
272
            self.fail('tried to join a path when name was None')
 
273
 
 
274
    def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis(self):
 
275
        tree_a = self.make_branch_and_tree('a')
 
276
        self.build_tree(['a/file_1', 'a/file_2'])
 
277
        tree_a.add(['file_1'])
 
278
        tree_a.commit('commit 1')
 
279
        tree_a.add(['file_2'])
 
280
        tree_a.commit('commit 2')
 
281
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
282
        tree_b.rename_one('file_1', 'renamed')
 
283
        _merge_helper(['b', None], ['b', -1], this_dir='a')
 
284
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])