← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-18 05:59:25 UTC
  • mfrom: (1551.6.16 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
implementation of --reprocess for weave merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2465
2465
    if show_base and not merge_type is Merge3Merger:
2466
2466
        raise BzrCommandError("Show-base is not supported for this merge"
2467
2467
                              " type. %s" % merge_type)
2468
 
    if reprocess and not merge_type is Merge3Merger:
2469
 
        raise BzrCommandError("Reprocess is not supported for this merge"
2470
 
                              " type. %s" % merge_type)
 
2468
    if reprocess and not merge_type.supports_reprocess:
 
2469
        raise BzrCommandError("Conflict reduction is not supported for merge"
 
2470
                              " type %s." % merge_type)
2471
2471
    if reprocess and show_base:
2472
 
        raise BzrCommandError("Cannot reprocess and show base.")
 
2472
        raise BzrCommandError("Cannot do conflict reduction and show base.")
2473
2473
    try:
2474
2474
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2475
2475
        merger.pp = ProgressPhase("Merge phase", 5, pb)