[p4] Wrong (?) base revision integrating back from a child branch

[Williams, Kenneth (Ken) (TLR Corp)]

> -----Original Message-----
> From: perforce-user-admin at perforce.com
> [mailto:perforce-user-admin at perforce.com]On Behalf Of Alen Ladavac
> Sent: Monday, September 20, 2004 12:45 PM
> To: Tony Sweeney
> Cc: perforce-user at perforce.com
> Subject: Re: [p4] Wrong (?) base revision integrating back 
> from a child
> branch
> 
> 
> Hi Tony,
> 
> Thanks for your suggestion. We considered doing that (though we just
> manually resolved all conficts in the end), but it is not The 
> Solution.
> First of all, in this particular case, the second branch has 
> a "no broken
> code" policy as well. Also, doing that while other people 
> keep modifying the
> main branch can lead to a "neverending story". In practice it 
> would usually
> converge after a few cycles, but still sounds like a Sisyphean task.

I think you might want to reconsider some of those policies.  If the main branch is changing so fast that people can't even keep up with the changes, I don't know how you'd expect them to write & test new code fast enough to submit it either.

It sounds like people are taking a really long time between submits.  That makes the merging tasks exponentially harder.  No doubt the "no broken code" policies are contributing to the length of time (and lines of code) between submits, and you might want to try revisions to your processes to get those numbers down.

 -Ken