[p4] Partial branch integration causes problems

steve at vance.com steve at vance.com
Tue Mar 10 11:50:54 PDT 2009


When you tell Perforce to force an integration, you're not only telling it
to do it despite having done it before. You're also telling it to ignore
any previous integration history and go all the way back to the beginning
in evaluating the diffs.

Steve

Original Message:
-----------------
From: Finn Normann Pedersen merenpha at gmail.com
Date: 	Tue, 10 Mar 2009 14:12:12 +0100
To: perforce-user at perforce.com
Subject: [p4] Partial branch integration causes problems


Hi,

I have a problem with branching that I hope some of you might know a
solution on.

1. I branch some files from branch A to B.
2. Once work is done in B and I do a filespec integration from B to A,
but only some of the files are branched back into A to make testing A
more simple.
3. Once testing is done on the partial changes I want to integrate the
rest of the changes in B back into A ... but now perforce tells me
that the integration is "done" and there is nothing to integrate. I
then force integration of file already integrated (check under
options), but now the perforce merge application tells me that the
files are totally different, even though only minor changes exist.

Is this a perforce problem? A merge application problem? ... or me ;o)  ??

Hope you can help !

Cheers,
  Finn Normann Pedersen
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user


--------------------------------------------------------------------
mail2web.com - Microsoft® Exchange solutions from a leading provider -
http://link.mail2web.com/Business/Exchange





More information about the perforce-user mailing list