← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
493
493
        wtb = d_b.open_workingtree()
494
494
        wtb.commit('this revision', allow_pointless=False)
495
495
        self.assertEqual(1, wtb.merge_from_branch(wta.branch))
496
 
        self.failUnlessExists('b/file.THIS')
497
 
        self.failUnlessExists('b/file.BASE')
498
 
        self.failUnlessExists('b/file.OTHER')
 
496
        self.assertPathExists('b/file.THIS')
 
497
        self.assertPathExists('b/file.BASE')
 
498
        self.assertPathExists('b/file.OTHER')
499
499
        wtb.revert()
500
500
        self.assertEqual(1, wtb.merge_from_branch(wta.branch,
501
501
                                                  merge_type=WeaveMerger))
502
 
        self.failUnlessExists('b/file')
503
 
        self.failUnlessExists('b/file.THIS')
504
 
        self.failUnlessExists('b/file.BASE')
505
 
        self.failUnlessExists('b/file.OTHER')
 
502
        self.assertPathExists('b/file')
 
503
        self.assertPathExists('b/file.THIS')
 
504
        self.assertPathExists('b/file.BASE')
 
505
        self.assertPathExists('b/file.OTHER')
506
506
 
507
507
    def test_weave_conflicts_not_in_base(self):
508
508
        builder = self.make_branch_builder('source')
532
532
        self.assertEqual(1, tree.merge_from_branch(tree.branch,
533
533
                                                   to_revision='D-id',
534
534
                                                   merge_type=WeaveMerger))
535
 
        self.failUnlessExists('tree/foo.THIS')
536
 
        self.failUnlessExists('tree/foo.OTHER')
 
535
        self.assertPathExists('tree/foo.THIS')
 
536
        self.assertPathExists('tree/foo.OTHER')
537
537
        self.expectFailure('fail to create .BASE in some criss-cross merges',
538
 
            self.failUnlessExists, 'tree/foo.BASE')
539
 
        self.failUnlessExists('tree/foo.BASE')
 
538
            self.assertPathExists, 'tree/foo.BASE')
 
539
        self.assertPathExists('tree/foo.BASE')
540
540
 
541
541
    def test_merge_unrelated(self):
542
542
        """Sucessfully merges unrelated branches with no common names"""
584
584
        wtb.commit('changed file', allow_pointless=False)
585
585
        wtb.merge_from_branch(wta.branch, wta.branch.last_revision(),
586
586
                              wta.branch.get_rev_id(1))
587
 
        self.failIf(os.path.lexists('b/file'))
 
587
        self.assertFalse(os.path.lexists('b/file'))
588
588
 
589
589
    def test_merge_metadata_vs_deletion(self):
590
590
        """Conflict deletion vs metadata change"""
618
618
        b_wt.commit('r1', rev_id='r1')
619
619
        self.assertEqual(0, a_wt.merge_from_branch(b_wt.branch,
620
620
            b_wt.branch.last_revision(), b_wt.branch.get_rev_id(1)))
621
 
        self.failUnlessExists('a/un')
622
 
        self.failUnless('a/deux')
 
621
        self.assertPathExists('a/un')
 
622
        self.assertTrue('a/deux')
623
623
        self.assertFalse(os.path.exists('a/tmp'))
624
624
        self.assertEqual(file('a/un').read(),'DEUX')
625
625
        self.assertEqual(file('a/deux').read(),'UN')