/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

  • Committer: Robert Collins
  • Date: 2006-08-25 02:21:46 UTC
  • mto: (1908.6.9 use set_parent_trees.)
  • mto: This revision was merged to the branch mainline in revision 1972.
  • Revision ID: robertc@robertcollins.net-20060825022146-6e344ca329c52a6e
Adding a parent when the first is a ghost already should not require forcing it.

Show diffs side-by-side

added added

removed removed

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