[p4] Reverse integration question

Chris Weiss chris.weiss at gmail.com
Tue Dec 5 15:32:29 PST 2006


I've lost the log window. This is P4V 2005.2.apif against P4D 2005.1.

On 12/5/06, Robert Cowham <robert at vaccaperna.co.uk> wrote:
> What does the log window show as the command being executed for integrate?
>
> Which version of p4v/p4d are you using?
>
> Robert
>
> > -----Original Message-----
> > From: perforce-user-bounces at perforce.com
> > [mailto:perforce-user-bounces at perforce.com] On Behalf Of Chris Weiss
> > Sent: 05 December 2006 19:21
> > To: Perforce Users
> > Subject: [p4] Reverse integration question
> >
> > I'm sort of new to dealing with integrations, so maybe I'm
> > missing something fundamental here, any help folks could give
> > would be appreciated!
> >
> > I've got //depot/main/... which many moons ago was branched
> > to //depot/sp1/... Some files in main were touched, but a lot
> > of development has gone on in sp1. Now, we're releasing sp1
> > and would like to do a reverse-integrate to bring all the
> > changes back to main that haven't been already integrated.
> >
> > In P4V, I selected Integrate and the branch spec that was
> > used to create sp1 (essentially "//depot/main/...
> > //depot/sp1/..."). Then selected "Reverse mapping in client
> > view" and selected Integrate. I then did a Resolve and
> > selected to automatically resolve using Theirs.
> > There's several files that are in the resulting changelist
> > that are in the sp1 branch (integrates, branches, and most
> > disturbingly, some files that were moved in main are queued
> > for deletion in sp1 with no corresponding add).
> >
> > Why is the integrate from sp1 to main changing some files in sp1?
> >
> > --
> > -Chris
> > _______________________________________________
> > perforce-user mailing list  -  perforce-user at perforce.com
> > http://maillist.perforce.com/mailman/listinfo/perforce-user
> >
>
>


-- 
-Chris


More information about the perforce-user mailing list