Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-59888

p4.run resolve results differs from console

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Open (View Workflow)
    • Priority: Minor
    • Resolution: Unresolved
    • Component/s: p4-plugin
    • Labels:
    • Environment:
      Jenkins: 2.190.1
      Operating System: Windows 10 x64
      p4-plugin: 1.10.5
      p4 Server version: Rev. P4V/NTX64/2019.1/1815056
    • Similar Issues:

      Description

      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.

        Attachments

          Activity

          Hide
          p4karl Karl Wirth added a comment -

          Hi Alex Volodko - Can you provide more information about the files that are unresolved. Please provide some example of the before and after file. If you would prefer to keep this information confidential please email them to support@perforce.com mentioning this job.

          Show
          p4karl Karl Wirth added a comment - Hi Alex Volodko - Can you provide more information about the files that are unresolved. Please provide some example of the before and after file. If you would prefer to keep this information confidential please email them to support@perforce.com mentioning this job.
          Hide
          xhelp Alex Volodko added a comment -

          I cannot provide the files yet, since the integration was done manually in the mean time. I will monitor this situation and provide real examples as soon as it appear again.
          The output of resolve command was

          tampered with before resolve - edit or revert
          

          This might be related to the older, but still open, bugĀ JENKINS-53588

          Show
          xhelp Alex Volodko added a comment - I cannot provide the files yet, since the integration was done manually in the mean time. I will monitor this situation and provide real examples as soon as it appear again. The output of resolve command was tampered with before resolve - edit or revert This might be related to the older, but still open, bugĀ  JENKINS-53588
          Hide
          p4karl Karl Wirth added a comment -

          Hi Alex,

          Quite possible. If it happens again can you pay particular attention to the file type in Perforce and if it has a BOM. Also as soon as there's anything we can do to help, please let us know.

          Show
          p4karl Karl Wirth added a comment - Hi Alex, Quite possible. If it happens again can you pay particular attention to the file type in Perforce and if it has a BOM. Also as soon as there's anything we can do to help, please let us know.

            People

            Assignee:
            Unassigned Unassigned
            Reporter:
            xhelp Alex Volodko
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated: