← 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-19 15:44:17 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-20070719154417-gb6sri5503b1u89w
Tweak from review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2844
2844
                    restore(tree.abspath(filename))
2845
2845
                except errors.NotConflicted:
2846
2846
                    pass
2847
 
            # Disable pending merges, to avoid affecting merge behavior
2848
 
            tree.set_parent_ids(parents[:1])
 
2847
            # Disable pending merges, because the file texts we are remerging
 
2848
            # have not had those merges performed.  If we use the wrong parents
 
2849
            # list, we imply that the working tree text has seen and rejected
 
2850
            # all the changes from the other tree, when in fact those changes
 
2851
            # have not yet been seen.
 
2852
            _get_parent_ids = tree.get_parent_ids
 
2853
            tree.get_parent_ids = lambda: parents[:1]
2849
2854
            try:
2850
2855
                conflicts = _mod_merge.merge_inner(
2851
2856
                                          tree.branch, other_tree, base_tree,
2856
2861
                                          show_base=show_base,
2857
2862
                                          reprocess=reprocess)
2858
2863
            finally:
2859
 
                tree.set_parent_ids(parents)
 
2864
                tree.get_parent_ids = _get_parent_ids
2860
2865
        finally:
2861
2866
            tree.unlock()
2862
2867
        if conflicts > 0: