Comment 1 for bug 1648894

Revision history for this message
Curtis Hovey (sinzui) wrote :

I have prepared a git branch to place 2.0.2 into zesty
   https://code.launchpad.net/~juju-qa/ubuntu/+source/juju-core/+git/juju-core/+ref/zesty-2.0.2

This branch imported juju 2.0.2 and updated d/copyright and d/changelog.

I had some misadventure with gbp import-orig because the ubuntu repo didn't provide master or upstream branches.
I forced the selection of upstream's changes when merging.
   git merge -s recursive -X theirs upstream/2.0.2