charm push does not accept merge revsions

[Aaron Bentley]

charm push does not accept revisions produced by bzr merge. It complains:
ERROR cannot parse bzr log: cannot parse bzr log entry: invalid revision number "80 [merge]"

This persists even if a second, non merge commit is made. I.e. it cannot be recovered without changing commit history.

This is a regression in the sense that the old publication method (just pushing to Launchpad) had no problem with merge commits.

$ charm push . ~juju-qa/trusty/juju-reports
url: cs:~juju-qa/trusty/juju-reports-31
channel: unpublished
ERROR cannot parse bzr log: cannot parse bzr log entry: invalid revision number "80 [merge]"
------------------------------------------------------------
revno: 80 [merge]
revision-id: <email address hidden>
parent: <email address hidden>
parent: <email address hidden>
committer: Aaron Bentley <email address hidden>
branch nick: trunk
timestamp: Mon 2017-01-09 09:29:41 -0500
message:
  Add test-failure-email support to charm.
<snip>
$ bzr commit -m "No-change commit to give charm push a non-merge revno." --unchanged
Committing to: /home/abentley/canonical/repo/trusty/juju-reports/.bzr/branches/trunk/

You need a passphrase to unlock the secret key for
user: "Aaron Bentley <email address hidden>"
2048-bit RSA key, ID 9C7FEF61, created 2009-05-14

Committed revision 81.
$ bzr push
Using saved push location: bzr+ssh://bazaar.launchpad.net/~juju-qa/charms/trusty/juju-reports/trunk/
Pushed up to revision 81.
$ charm push . ~juju-qa/trusty/juju-reports
url: cs:~juju-qa/trusty/juju-reports-31
channel: unpublished
ERROR cannot parse bzr log: cannot parse bzr log entry: invalid revision number "80 [merge]"
------------------------------------------------------------
revno: 81
revision-id: <email address hidden>
parent: <email address hidden>
committer: Aaron Bentley <email address hidden>
branch nick: trunk
timestamp: Mon 2017-01-09 09:41:03 -0500
message:
  No-change commit to give charm push a non-merge revno.
------------------------------------------------------------
revno: 80 [merge]
revision-id: <email address hidden>
parent: <email address hidden>
parent: <email address hidden>
committer: Aaron Bentley <email address hidden>
branch nick: trunk
timestamp: Mon 2017-01-09 09:29:41 -0500
message:
  Add test-failure-email support to charm.
<snip>

[Aaron Bentley (abentley)]

This is actually a real regression. 2.2.0-0ubuntu1~ubuntu16.04.1~ppa2 from the juju/stable PPA exhibits the bug, but charm 2.1.1-0ubuntu1 does not.

[Launchpad Janitor (janitor)]

Status changed to 'Confirmed' because the bug affects multiple users.