/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Implemented reprocess for weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2405
2405
    if show_base and not merge_type is Merge3Merger:
2406
2406
        raise BzrCommandError("Show-base is not supported for this merge"
2407
2407
                              " type. %s" % merge_type)
2408
 
    if reprocess and not merge_type is Merge3Merger:
 
2408
    if reprocess and not merge_type.supports_reprocess:
2409
2409
        raise BzrCommandError("Reprocess is not supported for this merge"
2410
2410
                              " type. %s" % merge_type)
2411
2411
    if reprocess and show_base: