Changeset 8a36bc1e in mainline


Ignore:
Timestamp:
2016-04-25T12:25:07Z (9 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d6f9fff
Parents:
6f2c1ff
Message:

fix compatibility with Bazaar 2.6.0: add ninth argument (number of context lines to print in a diff)

Location:
contrib/bazaar/bzreml
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • contrib/bazaar/bzreml/__init__.py

    r6f2c1ff r8a36bc1e  
    208208                                        tree_ac.lock_read()
    209209                                        try:
    210                                                 diff = DiffTree.from_trees_options(tree_prev, tree_ac, body, "utf8", None, "", "", None)
     210                                                diff = DiffTree.from_trees_options(tree_prev, tree_ac, body, "utf8", None, "", "", None, 3)
    211211                                                diff.show_diff(None, None)
    212212                                        finally:

  • contrib/bazaar/bzreml/setup.py

    r6f2c1ff r8a36bc1e  
    77        description = 'Commit email plugin for Bazaar',
    88        keywords = 'plugin bzr email',
    9         version = '1.4',
     9        version = '1.5',
    1010        url = 'http://www.decky.cz/',
    1111        license = 'BSD',
Note: See TracChangeset for help on using the changeset viewer.