bzr merge-upstream should adjust debian/changelog directly

Bug #296516 reported by Emmet Hikory
12
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-builddeb
Fix Released
Wishlist
Jelmer Vernooij
bzr-builddeb (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Binary package hint: bzr-builddeb

When using bzr merge-upstream to pull a new revision, debian/changelog should automatically be updated with the recommended version number and "New Upstream snapshot" when pulling from trunk, or "New Upstream version" when pulling from an appropriate tag. In the simple case where there are no conflicts, this allows the user to simply use debcommit to push the updated state of the package to the bzr repository for the package. In the more complex case, the user may need to adjust a couple things before being able to use debcommit, but can use dch normally to further update the changelog in preparation for debcommit. For extra portability between distributions and compatibility with standard practice when using VCS management of packaging, the special target "UNRELEASED" should be used in the changelog when it is updated (e.g. dch -v 1.2.3+bzr7477-1 -D UNRELEASED "New upstream snapshot").

Emmet Hikory (persia)
Changed in bzr-builddeb:
importance: Undecided → Wishlist
Revision history for this message
James Westby (james-w) wrote :

Hi,

Thanks for the report. I think I agree. Or at least I've forgotten why it doesn't
actually do it and just tells you what to do.

I think it might just have been that it was the easy thing to do.

Thanks,

James

Changed in bzr-builddeb:
status: New → Triaged
importance: Undecided → Wishlist
status: New → Triaged
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

This is implemented by my branch at lp:~jelmer/bzr-builddeb/mu-add-changelog

Revision history for this message
Emmet Hikory (persia) wrote :

Lookiing at the patch, I don't see it changing the target to "UNRELEASED". As many developers rely on this to indicate whether a given version has been uploaded, it is probably worth adjusting this as well. Other than that, this looks exactly like what I wanted.

Now, to address the reason it might not do this: I'm guessing that the result would probably be unsuitable for uploading to Ubuntu or a PPA directly (as it seems to encourage a revision of -1). By using UNRELEASED, the tool encourages the developer to double-check the version and target before uploading, which protects against this to some degree.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Good point. It's also not always working for me while using it regularly over the last month, so I need to look at it again.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Ideally, it should of course also merge the new entry with the last entry if that last entry has target set to "UNRELEASED".

Changed in bzr-builddeb:
assignee: nobody → jelmer
status: Triaged → In Progress
Revision history for this message
James Westby (james-w) wrote :

Hi,

I have just implemented basic support for this. I didn't implement
support for modifying the last changelog entry if it is UNRELEASED,
which I would like to do.

Thanks,

James

Changed in bzr-builddeb:
status: Triaged → Fix Committed
status: In Progress → Fix Committed
status: Fix Committed → Triaged
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package bzr-builddeb - 2.1~0ubuntu1

---------------
bzr-builddeb (2.1~0ubuntu1) jaunty; urgency=low

  [ Jelmer Vernooij ]
  * Add simple deb: directory service for Bazaar that uses the dpkg Vcs-* fields.
  * Fix mark-uploaded when used in merge mode. (Closes: #500851)
  * Support merging upstream from a Bazaar branch. (Closes: #493386)
   + Also support merging from upstream Subversion branches. (LP: #295275)
  * Make --version option and location argument to merge-upstream optional.
  * Add -d option to merge-upstream.
  * Try to retrieve upstream tarball using get-orig-source rule in
    debian/rules if everything else fails. (Closes: #498622)
  * Support Vcs-Git in the deb: directory service if bzr-git is installed.
  * Use svn-buildpackage configuration when present.
  * Print name of created tag in mark-uploaded. (Closes: #497416)

  [ James Westby ]
  * Support repacking of .zips. Thanks Daniel Hahler.
  * Switch to debuild instead of dpkg-buildpackage -rfakeroot -uc -us. The most
    noticeable change will be that it now tries to sign by default. Add a NEWS
    entry to explain this.
  * Support passing extra options to the builder using "bzr bd -- --foo" syntax.
  * Don't use the distribution name in the tags, fixing myriad issues, but
    giving us a compatibility headache. Old clients won't see the new tags,
    but using the old tags lead to bugs, and the only way to fix that is to
    use the new tags. Not a good situation, but moving forwards we will have
    a much better situation.
  * Update the changelog after merge-upstream, rather than telling the user
    exactly what to run. (LP: #296516)
  * Remove export-upstream mode in favour of merge-upstream, see NEWS.Debian.
  * Use pristine-tar to store and retrieve exact tarballs so that packages
    can be built directly from the branch. In particular merge-upstream and
    import-dsc now store this information. This will avoid problems with
    the .orig.tar.gz changing between uploads. (LP: #317111)
  * Depend on pristine-tar.

  [ Kees Cook ]
  * builder.py: switch to using external tar command to replace buggy
   tarfile unpacker. (Closes: #463349, LP: #303931)

 -- James Westby <email address hidden> Thu, 28 Aug 2008 11:41:35 +0100

Changed in bzr-builddeb:
status: Triaged → Fix Released
James Westby (james-w)
Changed in bzr-builddeb:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.