branch spec issue

Question

I am trying to port changelist "661234" from source to target branch using branch mapping "branch1.2_1.2.0" but I keep getting that its already commited but the changes are not merged actually..how can I overcome this?any tips on what the issue is?

I am been struggling since once hour trying various commands but no luck,appreicate any ehlp

C:\Users\>p4 integrate -b prima1.2_1.2.0 -c @661243
Invalid changelist number '@661243'.

C:\Users\>p4 integrate -b prima1.2_1.2.0 -c 661243
Change 661243 is already committed.

C:\Users\>p4 integrate -b prima1.2_1.2.0 -c 661243
Change 661243 is already committed.

C:\Users\>p4 integrate -f -b prima1.2_1.2.0 -c 661243
Change 661243 is already committed.

jgritty · Accepted Answer · 2012-12-22T04:19:09.260

4

Sorry, -c is the changelist to put the resulting change into, what you want is something like this:

p4 integrate -i -t -b prima1.2_1.2.0 //...@661243

edited Dec 22 '12 at 04:19

answered Dec 22 '12 at 03:17

jgritty

11,660
3
38
60

still get the output as "change is already commited"..why is p4 thinking so? – user1795998 Dec 22 '12 at 03:43
for some files on the branch..am getting error like "cant integrate ...without -i flag" – user1795998 Dec 22 '12 at 04:09
1

-i allows integrations between files that have no integration history. It permits baseless merges and just uses the earliest revision during p4 resolve. – jgritty Dec 22 '12 at 04:18

branch spec issue

1 Answers1