← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Martin Pool
  • Date: 2007-08-15 04:33:34 UTC
  • mto: (2701.1.2 remove-should-cache)
  • mto: This revision was merged to the branch mainline in revision 2710.
  • Revision ID: mbp@sourcefrog.net-20070815043334-01dx9emb0vjiy29v
Remove things deprecated in 0.11 and earlier

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
64
64
    )
65
65
from bzrlib.symbol_versioning import (
66
66
    deprecated_method,
67
 
    zero_eleven,
68
67
    zero_seventeen,
69
68
    )
70
69
from bzrlib.trace import mutter
607
606
        lr = LogRevision(rev, revno, 0, delta, tags)
608
607
        return self.log_revision(lr)
609
608
 
610
 
    @deprecated_method(zero_eleven)
611
 
    def show_merge(self, rev, merge_depth):
612
 
        lr = LogRevision(rev, merge_depth=merge_depth)
613
 
        return self.log_revision(lr)
614
 
 
615
609
    @deprecated_method(zero_seventeen)
616
610
    def show_merge_revno(self, rev, merge_depth, revno, tags=None):
617
611
        """Show a merged revision rev, with merge_depth and a revno."""