star or parallele merge

[William Dode]

On 29-09-2005, Aaron Bentley wrote:
>
> William Dode wrote:
>> I've one project used by two clients. To now i use star merging, with 3
>> branchs, one main, and one for each clients. When i make a feature for
>> one i do it on his branch, when it's finish i merge it to the main
>> branch and from the main to the other one.
>> 
>> I wonder, now that i use bzr (i was using tla and bazaar), if it will
>> be possible and better to don't use the main branch, and just keep one
>> branch for each and merge between them directly. Specialy that i don't 
>> need the main branch for anything else (i'm alone for this private
>> project).
>
> Using just two branches sounds fine, in theory.  I don't really
> understand why you're using three brances with tla, so I can't be sure
> that bzr handles the issue better.

No special reason, i just used to do like that...

I don't know if it's because of parrallele merging but even if it works
sometimes i do `bzr pull` it answer that "0 conflicts encountered." fine, but
if i do after `bzr missing` it answer that i miss something... Shall i
show somes example or is it normal (old format) ?

>
>> Is there a sort of documentation about differents organisations of 
>> branchs on the wiki ?
>
> I don't think there is, yet.

It could be very interresting to rewrite the famous tla tutorial with
bzr commands. I think i'll do it in french (i've translated the tla
tutorial in french).

-- 
William Dodé - http://flibuste.net