| I am trying to create a jenkins pipeline job, which will synchronized a P4 taskstream with the original branch. The setup of the pipeline is most likely not so important, but you can check it in the attached file. During the execution I call
p4.run('integrate', '-t', '-Rbds', '-c', changeListToBeUsed, '-b', P4_BRANCH_MAPPING_NAME)
This steps integrate the changes correctly using the given branch mapping and specified change list. Afterwards I try to resolve the conflicts automatically with
p4.run('resolve', '-am', '-Aactmdb', '-c', changeListToBeUsed)
Unfortunatly this call leave some files unresolved, but when I perform this operation via p4 client or command line, all files can be resolved. The tests are done on the same change list (I have skipped the p4.run('resolve'...) step and executed it manually on the changelist created by jenkins). I understand, that not every file can be resolved automatically, but the point is, that on the very same changelist p4 command line can resolve it, but p4 plugin not. I do have a workaround to execute sh 'p4 resolve...' step instead, but in this case I have to deal with credentials manually and I would like to avoid it. |
