[p4] Merging an indirect branch to the mainline.

Raghu Kumar C RaghuKumar.c at tavant.com
Thu Jun 21 02:38:17 PDT 2007


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.



More information about the perforce-user mailing list