← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-08 19:09:55 UTC
  • mfrom: (6248 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6249.
  • Revision ID: jelmer@samba.org-20111108190955-xspn5rb9kpgw78oy
merge lp:bzr

Show diffs side-by-side

added added

removed removed

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