← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Packman
  • Date: 2011-11-08 17:07:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6247.
  • Revision ID: martin.packman@canonical.com-20111108170723-ys88gzmjz9sh2k15
Allow any number of intermingled lines rather than just zero or one

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1004
1004
                                show_base=show_base)
1005
1005
                    basis_root_id = basis_tree.get_root_id()
1006
1006
                    new_root_id = new_basis_tree.get_root_id()
1007
 
                    if basis_root_id != new_root_id:
 
1007
                    if new_root_id is not None and basis_root_id != new_root_id:
1008
1008
                        self.set_root_id(new_root_id)
1009
1009
                finally:
1010
1010
                    basis_tree.unlock()
1011
1011
                # TODO - dedup parents list with things merged by pull ?
1012
1012
                # reuse the revisiontree we merged against to set the new
1013
1013
                # tree data.
1014
 
                parent_trees = [(self.branch.last_revision(), new_basis_tree)]
 
1014
                parent_trees = []
 
1015
                if self.branch.last_revision() != _mod_revision.NULL_REVISION:
 
1016
                    parent_trees.append(
 
1017
                        (self.branch.last_revision(), new_basis_tree))
1015
1018
                # we have to pull the merge trees out again, because
1016
1019
                # merge_inner has set the ids. - this corner is not yet
1017
1020
                # layered well enough to prevent double handling.