← 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-17 20:03:42 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-20070717200342-sq5gq5m9fwu1a5xu
fix deprecations in remerge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2845
2845
                except errors.NotConflicted:
2846
2846
                    pass
2847
2847
            # Disable pending merges, to avoid affecting merge behavior
2848
 
            pending_merges = tree.pending_merges()
2849
 
            tree.set_pending_merges([])
 
2848
            tree.set_parent_ids(parents[:1])
2850
2849
            try:
2851
2850
                conflicts = _mod_merge.merge_inner(
2852
2851
                                          tree.branch, other_tree, base_tree,
2857
2856
                                          show_base=show_base,
2858
2857
                                          reprocess=reprocess)
2859
2858
            finally:
2860
 
                tree.set_pending_merges(pending_merges)
 
2859
                tree.set_parent_ids(parents)
2861
2860
        finally:
2862
2861
            tree.unlock()
2863
2862
        if conflicts > 0: