← Back to team overview

vm team mailing list archive

Minor faux paus with the Launchpad branches

 

Funny things happen. 

Shortly after releasing the 8.2.0b version, I noticed that there was an
option to change the "development focus" of the project on Launchpad.  Since
the 8.2.x series will be the main release series for a while, I changed the
"development focus" from "trunk series" to "8.2.x series".  That changed the
"Series and milestones" picture on the front page, putting the 8.2.x series
at the top (instead of "trunk").  I thought that was good.

But, little did I realize that Launchpad also made 8.2.x branch of the code
into the main "lp:vm".  So, all the pushes that I did from my local trunk
got pushed into the 8.2.x branch instead of the trunk.  I just noticed that
"lp:vm" pointed to lp:vm/8.2.x, and it had all the revisions that I pushed
in recent days.  I would have expected bazaar to complain that the branches
had diverged or something.  Instead, it silently overwrote whatever was on
the 8.2.x branch on Launchpad.

I just changed the "development focus" back to trunk and pushed all my new
revisions into it.  I also uploaded the 8.2.x branch on my computer into a
new branch ~vm/vm/8.2.x-copy on Launchpad.

I think we will just keep the clobbered 8.2.x branch on Launchpad as it is,
and pretend nothing ever went wrong.  Hopefully, we won't need to go back to
anything on the old 8.2.x branch.

Cheers,
Uday