/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/merge.py

  • Committer: Aaron Bentley
  • Date: 2007-12-09 22:58:47 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071209225847-742dknf7ywjzv5uo
Prevent reverse cherry-picking with weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
369
369
        elif self.show_base:
370
370
            raise BzrError("Showing base is not supported for this"
371
371
                                  " merge type. %s" % self.merge_type)
 
372
        if (not getattr(self.merge_type, 'supports_reverse_cherrypick', True)
 
373
            and not self.base_is_other_ancestor):
 
374
            raise errors.CannotReverseCherrypick()
372
375
        self.this_tree.lock_tree_write()
373
376
        if self.base_tree is not None:
374
377
            self.base_tree.lock_read()
416
419
    supports_reprocess = True
417
420
    supports_show_base = True
418
421
    history_based = False
 
422
    supports_reverse_cherrypick = True
419
423
    winner_idx = {"this": 2, "other": 1, "conflict": 1}
420
424
 
421
425
    def __init__(self, working_tree, this_tree, base_tree, other_tree, 
978
982
    """Three-way tree merger, text weave merger."""
979
983
    supports_reprocess = True
980
984
    supports_show_base = False
 
985
    supports_reverse_cherrypick = False
981
986
 
982
987
    def __init__(self, working_tree, this_tree, base_tree, other_tree, 
983
988
                 interesting_ids=None, pb=DummyProgress(), pp=None,