[p4] integration via main problem
Christian.Mogensen at superoffice.com
Thu Aug 29 02:09:54 PDT 2002
We have two branches off our main trunk, and I want to integrate changes from one branch to main, and then from main to the other branch.
So we have Main, with branches SR5.5 and SR5.5_Japan like this:
"//crm/Client/Main/..." "//crm/Client/SR5.5 Japan/..."
First I do
p4 integrate -b SR5.5 -s @1234,1234
I get some files that need integration.
I integrate them all and submit the new changelist.
Call the new changelist 2345.
So far so good.
When I say
p4 integrate -b SR5.5_Japan -s @2345,2345
I get back:
No revision(s) above those at that changelist number.
CL 2345 is the last change on the Main branch, but it should be able to integrate those changes over into the other branch.
Does it have something to do with the fact that CL 2345 contains only integrations?
We are running P4 Server version: P4D/NTX86/2000.2/19882 (2001/01/05)
Any help is appreciated. Thanks.
"Beyond this line, everything is different."
- Danger Ranger, BurningMan
More information about the perforce-user