← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_merge_core.py

Adding merge-delete-conflicts test case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_merge_core.py
626
626
        self.assert_(os.path.lexists('a/file'))
627
627
        self.assert_(os.path.lexists('a/file.moved'))
628
628
        self.assertEqual(a.working_tree().pending_merges(), [b.last_revision()])
 
629
 
 
630
    def test_merge_deleted_conflicts(self):
 
631
        os.mkdir('a')
 
632
        a = Branch.initialize('a')
 
633
        file('a/file', 'wb').write('contents\n')
 
634
        a.add('file')
 
635
        a.working_tree().commit('a_revision', allow_pointless=False)
 
636
        del a
 
637
        self.run_bzr('branch', 'a', 'b')
 
638
        a = Branch.open('a')
 
639
        os.remove('a/file')
 
640
        a.working_tree().commit('removed file', allow_pointless=False)
 
641
        file('b/file', 'wb').write('changed contents\n')
 
642
        b = Branch.open('b')
 
643
        b.working_tree().commit('changed file', allow_pointless=False)
 
644
        merge(['a', -1], ['a', 1], this_dir='b')
 
645
        self.failIf(os.path.lexists('b/file'))
 
646