← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-10-23 05:55:04 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: aaron.bentley@utoronto.ca-20051023055504-118466d505ee4f52
Updated NEWS, error out if --show-base supplied and unsupported

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
278
278
    if this_dir is None:
279
279
        this_dir = '.'
280
280
    this_branch = Branch.open_containing(this_dir)[0]
281
 
 
 
281
    if show_base and not merge_type is ApplyMerge3:
 
282
        raise BzrCommandError("Show-base is not supported for this merge"
 
283
                              " type. %s" % merge_type)
282
284
    merger = Merger(this_branch)
283
285
    merger.check_basis(check_clean)
284
286
    merger.set_other(other_revision)