On 05/05/2015, Andrew Wilkins <[email protected]> wrote: > > Those fixes were not made on v5, and only existed on v6-unstable. > I later came along and merged some changes into v5 and updated > Juju's dependencies.tsv to the latest commit on v5. That meant the > fixes were dropped.
Not easy to track this history on github, but as far as I can see v6-unstable did not exist when those changes were merged. Looks like v5 was then renamed in the web ui to v6-unstable and v5 was pushed up from an earlier revision. When your branch went to bump the rev, it therefore dropped those changes (and when I went to pull my v5 branch locally, it complained of diverged branches). Martin -- Juju-dev mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/juju-dev
