Public bug reported: 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: aaron.bent...@canonical.com-20170109142941-d3lkfbuvu99ge27a parent: cur...@canonical.com-20160826174407-8mdbkl037ye5nbob parent: aaron.bent...@canonical.com-20170106181828-yiax31dplhoremk8 committer: Aaron Bentley <aaron.bent...@canonical.com> 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 <aa...@aaronbentley.com>" 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: aaron.bent...@canonical.com-20170109144103-0zzts3qsimr7uzy1 parent: aaron.bent...@canonical.com-20170109142941-d3lkfbuvu99ge27a committer: Aaron Bentley <aaron.bent...@canonical.com> 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: aaron.bent...@canonical.com-20170109142941-d3lkfbuvu99ge27a parent: cur...@canonical.com-20160826174407-8mdbkl037ye5nbob parent: aaron.bent...@canonical.com-20170106181828-yiax31dplhoremk8 committer: Aaron Bentley <aaron.bent...@canonical.com> branch nick: trunk timestamp: Mon 2017-01-09 09:29:41 -0500 message: Add test-failure-email support to charm. <snip> ** Affects: charm (Ubuntu) Importance: Undecided Status: New ** Tags: regression -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1655051 Title: charm push does not accept merge revsions To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/charm/+bug/1655051/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs