[p4] tracking 3rd party sources
Chuck Karish
chuck.karish at gmail.com
Wed Mar 28 13:00:16 PST 2007
On 3/26/07, Steve M. Robbins <steve at sumost.ca> wrote:
> Hi,
>
> I'm curious to hear about real-world experience in tracking 3rd party
> sources using Perforce. Our group is new to Perforce, so we're
> relying heavily on Laura Wingerd's book Practical Perforce. I'm
> curious as to whether her recommended procedure is, indeed, widely
> followed.
>
> My understanding of her recommendation (please correct if I've got
> some detail wrong) is as follows:
>
> 1. Import pristine upstream source code into a separate "import" codeline,
> say //depot/IMPORT.
>
> 2. Integrate from //depot/IMPORT into your development codeline.
>
> 3. When a new version comes out, commit it into IMPORT, making the
> necessary additions, deletions, and changes. Then integrate the
> new version into your development codeline again; this allows you
> to benefit from Perforce's 3-way merge.
The question to ask yourself is, "What will I have to do to re-base
my local version when the next release comes downstream?" The
easier it is to isolate your local changes and re-apply or port them
to the new base version, the happier you'll be.
--
Chuck Karish karish at well.com (415) 317-0182
More information about the perforce-user
mailing list