[p4] Changelist-at-a-time VS bulk integration
Mark Allender
marka at Volition-inc.com
Fri Dec 8 14:21:43 PST 2006
During a recent large project, we cherry-picked changelist integration. We
tried to follow some general rules (like try and integrate cherry-picked
changelists in order, only specific people did integrations, etc).
We had a main branch and several demo branches. Demo branches had specific
code for the demos as well as some code that had to be rolled to mainline.
So, we cherry picked the changelists in the demo branch that needed
integration back to main all while some people were still working in main.
We never had a problem. Worked like a charm. There is certainly room for
issues and problems to develop when doing a cherry-pick method and I don't
necessarily recommend it. But for specific cases, it can work just fine.
> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Rick
> Macdonald
> Sent: Friday, December 08, 2006 2:25 PM
> To: Perforce Users Mailing List
> Subject: [p4] Changelist-at-a-time VS bulk integration
>
> The current thread about Cherry-picking reminds me that I
> never heard or
> thought about integrating one changelist at a time. I just do
> everything
> at once and hope for the best. Mostly it's fine. Things can get
> complicated, but it's always been doable.
>
> I first came across the one-at-a-time idea in Laura's book. I
> won't give
> an example; I'll assume folks here know what I'm referring to.
>
> Any comments about this? Does anybody do it always? Just when
> you think
> you might need to? Never?
>
> ...RickM...
> _______________________________________________
> perforce-user mailing list - perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
More information about the perforce-user
mailing list