[p4] FW: Driving through hedges vs. intermediate branches

[Slava Imeshev]

Brad,

Sorry for the late reply. Plese see inline:

--- Brad Holt <brad.holt at autodesk.com> wrote:

> That looks good, on the assumption that indirect integrations are OK
> (the 1.5->main integrations for new features).  

My recommendation would be R1.5 -> R1.0, then R1.0 -> mainline. But, 
given Perforce capabilities, indirect merges should be fine. In any
case "common" may be avoided.

Regards,

Slava Imeshev

> So that's one vote for indirect integrations.
> 
> Thanks Slava.
> 
> -----Original Message-----
> From: Slava Imeshev [mailto:imeshev at yahoo.com] 
> Sent: Friday, February 09, 2007 11:40 AM
> To: Brad Holt; perforce-user at perforce.com
> Subject: Re: [p4] FW: Driving through hedges vs. intermediate branches
> 
> 
> --- Brad Holt <brad.holt at autodesk.com> wrote:
> 
> > 
> > 
> >                 R1 ---------------->
> >                    |
> > common   |------------------------->
> >          |         |
> >          |    R1.5 ---------------->
> >          |
> > Main------------------------------->
> > 
> 
> 
> What about  this?
> 
>                  R1.5 ----------------------->
>                      |       |            |
>                      |       | Bug fixes  |
>                      |       V            |
>      R1.0 |-------------------------------|--->
>           |     |            |            |
>           |     |  Bug fixes |            | New features
>           |     V            V            V
>  Main---------------------------------------->
> 
> 
> Regards,
> 
> Slava Imeshev
> www.viewtier.com
> 
> 
> 
> 
> 
>