Maintaining trunk and stable branch

[Frits Jalvingh]

Very easily: just merge your "stable" branch into the trunk ;-)

For this to work you must make the fixes on the stable branch, and trunk
must have been stable at one time, i.e. you created trunk by just making
another branch (copy) of stable.

Now fix code on stable and commit it until done. If you're happy with
the result merge stable /into/ trunk.

Frits

On Sun, 2011-02-20 at 15:21 +0100, Timo wrote:
> Hello all,
> 
> I have a project that uses Bazaar on Launchpad. Until now, I always
> worked in the main trunk branch, but recently I branched off a stable
> branch, where I will commit some bugfixes while adding new features to
> trunk.
> But how do I get the bugfixes from the stable branch in trunk?
> Preferred with revision history inact.
> 
> Cheers,
> Timo