← Back to branch summary

~ubuntu-branches/ubuntu/raring/bzr-svn/raring

« back to all changes in this revision

Viewing changes to annotate.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-07-30 23:14:36 UTC
  • mfrom: (1.1.28 upstream) (3.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100730231436-po8j0ibgjn2d6hy0
Tags: 1.0.3-1
http://bugs.debian.org/572109
http://bugs.debian.org/573988
https://launchpad.net/bugs/481730
* New upstream release.
 + Provides BranchConfig._get_change_editor. Closes: #572109
 + Supports more trunk layout levels. Closes: #573988
* Bump standards version to 3.9.1.
* Mark as supporting bzr 2.2.
* Suggest bzr-rewrite rather than bzr-rebase. LP: #481730

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate.py
67
67
        idmap = self._repository.get_fileid_map(revmeta, mapping)
68
68
        return idmap.lookup(mapping, ip)
69
69
 
70
 
    def _handler(self, path, rev, revprops):
 
70
    def _handler(self, path, rev, revprops, result_of_merge=None):
71
71
        try:
72
72
            fileid, revid, _ = self._get_ids(path, rev, revprops)
73
73
            assert revid is not None