question about creating a branch

[Tom Widmer]

Adrián Ribao Martínez wrote:
> Hello,
> 
> I have a web project versioned with bazaar. Now we have launched a stable version and from now on we'll work implementing new features, but maintainig the current version.
> 
> I have at /trunk the current project, my question is about what is the best approach to continue developing and maintaining this stable version.
> 
> I have two options:
> 
> * Create a branch named: myproject1.0 and maintain that branch while we can implement more features in the branch. The problem is that the server is taking the code from trunk.
> 
> * Create a tag and start a new branch named myproject2.0, work on it an then merge it to trunk.
> 
> What should I do?

Here are some possibilities:

Create a new branch called 'myproject2.0' or 'next' or whatever, and 
develop new features in branches from that, pushing them to next when 
they are done.

Fix bugs in trunk by branching from trunk, fixing the bug, merging from 
trunk and finally pushing the changes back to trunk. Then merge the 
changes from trunk into next, making any changes required to fix for 
next in the process.

Another approach is to use bazaar bisect to find where the bug was 
introduced, create a branch from that revision and fix the bug in the 
branch, then merge that fix branch into any release branches that have 
the original bug in. If the bug fix branches are all in a shared 
repository, there's no reason why you can't keep them around 
indefinitely, since they don't take up much space.

See  http://www.monotone.ca/wiki/DaggyFixes/

Tom