[p4] Merging an indirect branch to the mainline.

[Jeff A. Bowles]

The short answer to your question is, "if you had labeled
or can identify the 'branch point' for A (where A1 was branched),
you can run a "p4 integrate" with the source revision set to
just after that, integrating to A2."

The real short answer is, "what are you trying to do? This
looks like a mix of a cascading branch model (which is a
fairly bad model to use) and a top-level tree called "mainline".

If A2 is supposed to be a place for a new release tree,
which the A->A2 operation seems to want to create, then
it would be far better to root "A1" and "A2" both off "A" and
then integrate from A1 back to its parent, A, and occasionally
propagate from A->A2 until the work/checkins in A start
containing release 3 (proto-A3) work.

   -Jeff Bowles


On 6/21/07, Raghu Kumar C <RaghuKumar.c at tavant.com> wrote:
> Hi,
>
>         I have a mainline branch called A. From this I have a branch
> called A1 with a branch spec. Now I have created a new branch from A1
> called A2 with another branch spec. The pictorial view looks like this.
>
> ----------------------------A
>         |
>         |
>         -----------A1
>              |
>              |
>              -----------A2
>
>         Integration from A1 to A using the branch spec works perfect. It
> only shows me those files that have changed during integration.
>
>         Now, when I integrate from A2 to A, I am not able to integrate
> it using the branch spec, so I used the file spec option to integrate.
> The problem here is instead of showing me only those files that have
> changed between A and A2 it shows me all the files inside the A2 branch,
> which runs into thousands. My doubt is - is this expected behaviour?
> Can't the tool trace the branch's ancestry? Is there a better way to
> branch where I just need to merge only the changed files instead of the
> whole list of files in my branch? I am on Perforce 2003.1/46260.
>
> Thank you,
> Raghu
> Any comments or statements made in this email are not necessarily those of Tavant Technologies. The information transmitted is intended only for the
> person or entity to which it is addressed and may contain confidential and/or privileged material. If you have received this in error, please contact
> the sender and delete the material from any computer. All e-mails sent from or to Tavant Technologies. may be subject to our monitoring procedures.
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>


-- 
---
Jeff Bowles - jeff.a.bowles at gmail.com