Noob questions for installing/upgrading Bazaar, and setting up/understanding feature branch workflow...

[Neil Martinsen-Burrell]

On 2009-04-13 2:04 AM, Richard B. wrote:
>> bzr commit -m "merged new feature"
>
> I meant to write
>
> bzr commit -m "new feature attempt 1"
> bzr commit -m "new feature attempt 2"
> bzr commit -m "new feature attempt 3"
>
> then once the feature was complete, I would do the final commit to
> trunk ?

The final commit doesn't take place on the trunk.  When the feature is 
complete, you "merge" the branch to the trunk with

cd Projects/Project1/trunk
bzr merge ../branch/new_feature

and resolve conflicts and then commit in the trunk directory.

-Neil