/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
63
63
        file('hello', 'wt').write('quuux')
64
64
        # We can't merge when there are in-tree changes
65
65
        self.runbzr('merge ../b', retcode=3)
66
 
        self.runbzr(['commit', '-m', "Like an epidemic of u's"])
 
66
        a = WorkingTree.open('.')
 
67
        a_tip = a.commit("Like an epidemic of u's")
67
68
        self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
68
69
                    retcode=3)
69
70
        self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
75
76
        self.runbzr('merge ../b -r last:1')
76
77
        self.check_file_contents('goodbye', 'quux')
77
78
        # Merging a branch pulls its revision into the tree
78
 
        a = WorkingTree.open('.')
79
79
        b = Branch.open('../b')
80
 
        a.branch.repository.get_revision_xml(b.last_revision())
81
 
        self.log('pending merges: %s', a.pending_merges())
82
 
        self.assertEquals(a.pending_merges(),
83
 
                          [b.last_revision()])
 
80
        b_tip = b.last_revision()
 
81
        self.failUnless(a.branch.repository.has_revision(b_tip))
 
82
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
84
83
        self.runbzr('revert --no-backup')
85
84
        # If bzr merge is fixed to work with two revno:N:path with
86
85
        # different paths, uncomment this section.        
92
91
        self.runbzr('merge -r revno:%d:../b'%b.revno())
93
92
        self.assertEquals(a.pending_merges(),
94
93
                          [b.last_revision()])
95
 
        self.runbzr('commit -m merged')
 
94
        a_tip = a.commit('merged')
96
95
        self.runbzr('merge ../b -r last:1')
97
 
        self.assertEqual(a.pending_merges(), [])
 
96
        self.assertEqual([a_tip], a.get_parent_ids())
98
97
 
99
98
    def test_merge_with_missing_file(self):
100
99
        """Merge handles missing file conflicts"""