ubuntu-phone team mailing list archive

[Robert Park <robert.park@xxxxxxxxxxxxx>]

Hi guys,

TL;DR: Bileto is currently unconditionally forcing all MP Commit
Messages into the changelog, so leave that field blank if your branch
supplies it's own changelog.


So with the big rollout a couple days ago I've been keeping a close
eye on the builds and seeing what's happening. One thing I'm seeing is
a lot of duplicate changelog entries, like this:

+  * New upstream release
+    - blah
+    - blah
+  * New upstream release

What's happening here is that the input MP writes it's own
debian/changelog, but then also supplies a commit message on the MP,
so when building it calls dch with the MP commit message, adding a
duplicate changelog entry to what was already there.

I realize this is a regression from the previous behavior which was
able to not duplicate messages in this way, so I'll work on fixing
this. For now, however, as a workaround please leave the "Commit
Message" field on your merge proposal empty, if you've written your
own debian/changelog. When you leave the commit message field blank,
bileto (and the old train code) use debcommit to commit your branch,
which reads the message from debian/changelog and makes the bzr commit
from that (debcommit was always a supported feature, it's just that
now bileto is getting confused when MPs supply both a commit message
and a debian/changelog entry).

Apologies for the inconvenience!

-- 
robru