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

Fix status to not use pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
669
669
        or the allow_leftmost_as_ghost parameter is set True.
670
670
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
671
671
        """
672
 
        self.set_parent_ids(self.get_parent_ids() + [revision_id],
673
 
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
 
672
        parents = self.get_parent_ids() + [revision_id]
 
673
        self.set_parent_ids(parents,
 
674
            allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
674
675
 
675
676
    @needs_write_lock
676
677
    def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):