-
Committer:
Bazaar Package Importer
-
Author(s):
James Westby
-
Date:
2009-02-19 09:26:34 UTC
-
mto:
(5.1.1 experimental)
-
mto:
This revision was merged to the branch mainline in
revision
7.
-
Revision ID:
james.westby@ubuntu.com-20090219092634-knjmzh0eltysu19m
Tags: 2.1
* Merge the tags from the upstream branch when doing merge-upstream with
a branch.
* Catch and wrap ChangelogParseError to avoid the traceback (LP: #215732)
* Warn when a key is defined outside of any sections in a config file.
(LP: #309335)
* Warn when the user uses the deprecated --result option. (LP: #268675)
* Add "--release-heuristic changelog" to dch call after merge-upstream so
that UNRELEASED entries are edited rather than a new stanza added.
(Closes: #515921, LP: #331994)
* Allow specifying the merge type in merge-upstream (LP: #310694)
* Make merge mode work with Python 2.6 (LP: #336686)
* Give a more informative message if pristine-tar isn't installed.
(LP: #336442)
* Record extra authors in import-dsc based on what is in the changelog
entry (LP: #335071)
* Provide a commit message template based on additions to debian/changelog,
similar to debcommit. Bump version of bzr required to 1.10, which is the
release that introduced the hook. (Closes: #497415, LP: #331993)
* Give a better error if the pristine upstream branch can't be located.
(Closes: #517869)