Don't export patches for simple rebuild

Reported by Raphaël Hertzog on 2008-02-04
4
Affects Status Importance Assigned to Milestone
Merge-o-Matic
Undecided
Adrien Cunin

Bug Description

Ubuntu sometime rebuilds packages (to get linked with newer version of libraries, or to get updated dependencies, etc.). An example is synfig_0.61.07-1build1. However those upload do not contain anything relevant for the corresponding Debian maintainers... thus patches for those cases should not be listed in http://patches.ubuntu.com/PATCHES otherwise they get listed in the PTS and the maintainer will want to check what patch Ubuntu has and will be uselessly disappointed.

See http://bugs.debian.org/462470 for the original discussion.

Adrien Cunin (adri2000) wrote :

Hi,
I already reported that to Scott who didn't consider it really as a bug. The rationale was that some buildX uploads actually contain something beyond the changelog entry. This is AFAIK wrong and people doing that should stop, so that we can safely exclude these packages from the patches list.

Adrien Cunin (adri2000) wrote :

See rev. 123 of my branch for a proposed fix.

Changed in merge-o-matic:
assignee: nobody → adri2000
status: New → In Progress
Siegfried Gevatter (rainct) wrote :

See bug #195070 for a related solution.

Paul Wise (Debian) (pabs) wrote :

This seems to be fixed now.

Adrien Cunin (adri2000) wrote :

This bug is *not* fixed. The patch is still not included.

Could you separate the fix from your development branch to a branch on its own that can be trivially merged?

Adrien Cunin (adri2000) wrote :

What about
  bzr merge -r 123 lp:~adri2000/merge-o-matic/dev
or
  bzr merge -r 122..123 lp:~adri2000/merge-o-matic/dev
?

The first one would include rev. 122 as well which contains some minor changes.

122 includes a change that's arguably controversial and doesn't fix this bug.

-c 123 would be a cherry pick, and I'd rather avoid that

Adrien Cunin (adri2000) wrote :

Done.
Indeed it seems bzr is not capable of keeping the commit messages when cherry-picking one or multiple revisions from a branch, but only when merging all the branch or up to revision X of the branch. So I cherry-picked the fix in a new branch, and manually copied the informations from my original commit in the commit message...

About rev 122, what do you find controversial? (this is a bit out of topic for this bug, maybe we should talk about that somewhere else)

Merged and pushed

Changed in merge-o-matic:
status: In Progress → Fix Released
Marco Rodrigues (gothicx) wrote :

This bug report says "Fix Released", but I can still see build1 patches in the list. Something wrong?

Any old patches will still be there.

To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers