Reputation: 5127
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.
Upvotes: 2
Views: 772
Reputation: 11915
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
Upvotes: 4