← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Martin Pool
  • Date: 2005-06-06 04:17:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050606041753-abe590daf0d7f959
Updated merge patch from Aaron

This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
28
28
    cset = changeset_function(base, other, base_inventory, other_inventory)
29
29
    new_cset = make_merge_changeset(cset, inventory, this, base, other, 
30
30
                                    conflict_handler)
31
 
    return apply_changeset(new_cset, invert_invent(this_inventory), this.root, 
32
 
                           conflict_handler, False)
 
31
    result = apply_changeset(new_cset, invert_invent(this_inventory),
 
32
                             this.root, conflict_handler, False)
 
33
    conflict_handler.finalize()
 
34
    return result
33
35
 
34
36
    
35
37