Perforce auto resolve from the command line?

前端 未结 3 1439
一生所求
一生所求 2021-02-19 20:41

P4V has been crapping out on me when attempting to resolve a large number of files as part of an integration. I want to be able to do this in the command line.

Here\'s

相关标签:
3条回答
  • 2021-02-19 21:13

    I do not have enough reputation to add a comment to the accepted answer so I'll add information in a new answer.

    With Perforce 2013.2 you can indeed provide a changelist number to resolve to limit the operation to the files in that changelist.

    p4 resolve -c changelist#
    
    0 讨论(0)
  • 2021-02-19 21:15

    You can use p4 resolve -am [file ...] which will skip the files with conflicts.

    If you specify a file, you will work on that file only. If you specify ..., you will work on files below your working directory. If you do not specify a file, it will work on all of the files in your workspace.

    0 讨论(0)
  • 2021-02-19 21:18

    I follow these steps, to do it from command line.

    1. In perforce client, Select the folder in workspace.
    2. Select File -> Open Terminal Window Here.Terminal will open in the same directory which is selcted in step 1.
    3. Perform a dry run using option -n :

    p4 resolve -c 1234 -n

    1. To accept automatic merge from perforce use -am option, Automatic Mode. Automatically accept the recommended file revision: if theirs is identical to base, accept yours; if yours is identical to base, accept theirs; if yours and theirs are different from base, and there are no conflicts between yours and theirs; accept merge; otherwise, there are conflicts between yours and theirs, so skip this file.

    p4 resolve -c 1234 -am

    0 讨论(0)
提交回复
热议问题