← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-07-20 12:45:27 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2639.
  • Revision ID: abentley@panoramicfeedback.com-20070720124527-rlyrmhdnovpj8vz7
Restore old method of adjusting partents

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2849
2849
            # list, we imply that the working tree text has seen and rejected
2850
2850
            # all the changes from the other tree, when in fact those changes
2851
2851
            # have not yet been seen.
2852
 
            _get_parent_ids = tree.get_parent_ids
2853
 
            tree.get_parent_ids = lambda: parents[:1]
 
2852
            tree.set_parent_ids(parents[:1])
2854
2853
            try:
2855
2854
                conflicts = _mod_merge.merge_inner(
2856
2855
                                          tree.branch, other_tree, base_tree,
2861
2860
                                          show_base=show_base,
2862
2861
                                          reprocess=reprocess)
2863
2862
            finally:
2864
 
                tree.get_parent_ids = _get_parent_ids
 
2863
                tree.set_parent_ids(parents)
2865
2864
        finally:
2866
2865
            tree.unlock()
2867
2866
        if conflicts > 0: