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

  • Committer: Jelmer Vernooij
  • Date: 2010-09-10 09:46:15 UTC
  • mfrom: (5417 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5418.
  • Revision ID: jelmer@samba.org-20100910094615-7soefxkmqroylqhj
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
3103
3103
    :ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
3104
3104
    """
3105
3105
 
 
3106
    @deprecated_method(deprecated_in((2, 3, 0)))
3106
3107
    def __int__(self):
3107
 
        # DEPRECATED: pull used to return the change in revno
 
3108
        """Return the relative change in revno.
 
3109
 
 
3110
        :deprecated: Use `new_revno` and `old_revno` instead.
 
3111
        """
3108
3112
        return self.new_revno - self.old_revno
3109
3113
 
3110
3114
    def report(self, to_file):
3135
3139
        target, otherwise it will be None.
3136
3140
    """
3137
3141
 
 
3142
    @deprecated_method(deprecated_in((2, 3, 0)))
3138
3143
    def __int__(self):
3139
 
        # DEPRECATED: push used to return the change in revno
 
3144
        """Return the relative change in revno.
 
3145
 
 
3146
        :deprecated: Use `new_revno` and `old_revno` instead.
 
3147
        """
3140
3148
        return self.new_revno - self.old_revno
3141
3149
 
3142
3150
    def report(self, to_file):