~ubuntu-branches/ubuntu/oneiric/bzr-builddeb/oneiric-proposed

Viewing all changes in revision 22.

  • Committer: Bazaar Package Importer
  • Author(s): Max Bowsher, Jelmer Vernooij, Max Bowsher
  • Date: 2011-05-06 00:36:30 UTC
  • mfrom: (5.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110506003630-rzs117pl6njpa6wa
Tags: 2.7.4
[ Jelmer Vernooij ]
* In 'bzr merge-upstream', don't ignore upstream branch when upstream
  version can not be found.  LP: #772424
* Automatically determine the version from the tarball name if possible.
  LP: #773199
* Use --create when merging a new upstream into a branch that doesn't have a
  changelog file. LP: #385667
* Fix merging of upstream in new packages. LP: #772225

[ Max Bowsher ]
* Add python-bzrlib.tests to Build-Depends-Indep.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: