~bzr/bzr/375898-missing-merged-root

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-29 16:54:16 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20100329165416-vbfnx484ff736gze
Commit for jam.

Show diffs side-by-side

added added

removed removed

Lines of Context:
281
281
        self.addCleanup(tree_b.unlock)
282
282
        os.unlink('B/a')
283
283
        tree_b.commit('3')
284
 
        try:
285
 
            tree_b.merge_from_branch(tree_a.branch)
286
 
        except AttributeError:
287
 
            self.fail('tried to join a path when name was None')
 
284
        tree_b.merge_from_branch(tree_a.branch)
288
285
 
289
286
    def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis(self):
290
287
        tree_a = self.make_branch_and_tree('a')