/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_status.py

Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
43
43
    def test_branch_status(self):
44
44
        """Test basic branch status"""
45
45
        wt = self.make_branch_and_tree('.')
46
 
        b = wt.branch
 
46
        wt.commit('create a parent to allow testing merge output')
47
47
 
48
48
        ignores._set_user_ignores(['./.bazaar'])
49
49