Launchpad itself

managing project milestones

Asked by Mike Hingley

i created some milestones for my project - https://launchpad.net/quickly-ubuntu-ebook - but i'm not sure how to manage milestones and code.

I wrote some new features but they didn't fit into the milestones - so what I wanted to do was push the updates - which I did - but now I have different code versions on different 'branches' - would these be branches?

so - how do I fix it.. any ideas or advice?

Question information

Language:
English Edit question
Status:
Solved
For:
Launchpad itself Edit question
Assignee:
No assignee Edit question
Solved by:
William Grant
Solved:
Last query:
Last reply:
Revision history for this message
William Grant (wgrant) said : 		#1

Have you read through https://help.launchpad.net/Projects/SeriesMilestonesReleases? It explains series, milestones, releases and how branches interact.

Revision history for this message
Mike Hingley (computa-mike) said : 		#2

I did read through it - and following your advice read through it again. I'm not sure I'm understanding this properly.

there's nothing in that document about how to merge the code back to trunk - I have a release (i thought perhaps a release would push the code back to the trunk) - and I was working on the basis that the trunk should contain the latest code. The web page seems to suggest that :

Development trunk: this is the current "tip" of development across the core project community, representing the very cutting edge of work on that project. In general, the only releases made from the development trunk are snapshot, milestone or test releases to generate more widespread testing and feedback.

I'm not sure I'm correctly explaining my question - so i'll use an example from https://code.launchpad.net/bzr.

This page shows the code branches for BZR -

the top 2 lines shows

lp:bzr Last Commit : 6589
lp:bzr/2.6 Last Commit : 6585

Looking at the trunk I can see commit 6585 in the trunk.

How did they get the code from the 2.6 series into trunk? Is there some merge process?

Revision history for this message
Best William Grant (wgrant) said : 		#3

In the case of the bzr project itself, most development happens on the lp:bzr branch. As the bzr team approached the 2.6 release, they branched lp:bzr/2.6 from lp:bzr and stabilised in preparation for 2.6 there, while continuing main unstable trunk development on lp:bzr. lp:bzr r6585 is a merge of lp:bzr/2.6 into lp:bzr, done with 'bzr merge lp:bzr/2.6'.

See http://doc.bazaar.canonical.com/bzr.2.6/en/tutorials/tutorial.html#branching and the later sections on merging etc. http://doc.bazaar.canonical.com/beta/en/user-guide/bazaar_workflows.html describes some example branch workflows.

Revision history for this message
Mike Hingley (computa-mike) said : 		#4

Thanks William Grant, that solved my question.