← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_parents.py

Fix status to not use pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_parents.py
149
149
        tree = self.make_branch_and_tree('.')
150
150
        tree.add_parent_tree_id('first-revision', allow_leftmost_as_ghost=True)
151
151
        self.assertConsistentParents(['first-revision'], tree)
 
152
 
 
153
    def test_add_second_parent_id_with_ghost_first(self):
 
154
        """Test adding the second parent when the first is a ghost."""
 
155
        tree = self.make_branch_and_tree('.')
 
156
        tree.add_parent_tree_id('first-revision', allow_leftmost_as_ghost=True)
 
157
        tree.add_parent_tree_id('second')
 
158
        self.assertConsistentParents(['first-revision', 'second'], tree)
152
159
        
153
160
    def test_add_second_parent_id(self):
154
161
        """Test adding the second parent id"""