[p4] Integrate a labeled branch
dli at force10networks.com
Wed Oct 4 19:40:11 PDT 2000
I have two branches b1 and b2. At one point, I labeled the code in b1 as
L1_b1. Later I labeled it again with L2_b1 after new checkins. Now I 'd like
to integrate L1_b1 into b2. Does anyone know the command line instructions
for this? Is it something similar to "p4 integrate ..."?
Routing Software Group
Email: dli at force10networks.com
>>>From: Chuck Karish [mailto:karish at bea.com]
>>>Sent: Wednesday, October 04, 2000 6:43 PM
>>>To: Eric Herrmann; 'perforce-user at perforce.com'
>>>Subject: Re: [p4] Re: branch topology
>>>At 05:42 PM 10/4/00, Eric Herrmann wrote:
>>>> >After much debate we seem to have adopted the 'barnacle'
>>>scheme too :)
>>>> >It has the advantage of ensuring that broken code is
>>>never presented to
>>>> >developers who don't own it.
>>>>To each their own, but this is exactly why I don't like the
>>>model. We had an
>>>>incident today where one developer happened to notice a
>>>confusing but nearly
>>>>invisible bug in another developer's code. Had they been running on
>>>>different branches, it could have ended up in customer's
>>>hands [it wouldn't
>>>>have been that serious, but it could have been very
>>>>are good like that: they often notice things that are
>>>slightly out of whack.
>>>We're not talking about building the Berlin wall between
>>>development groups. In our shop code is merged
>>>back to the main line as soon as it's stable. Every
>>>branch is a full image of the main line, so everyone sees
>>>everyone else's code as soon as they pull back from the
>>>main line to their branch.
>>> Chuck Karish BEA Systems
>>> karish at bea.com San Francisco, CA
>>> (415) 317-0182 (cell) (415) 402-7692
>>>perforce-user mailing list - perforce-user at perforce.com
More information about the perforce-user