CODEWITHSUNDEEP
perforcep4v
Fostah
Fostah

Reputation: 11776

Perforce auto resolve from the command line?

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 the steps in P4V:

  1. Right-click the CL.
  2. Choose "Resolve Files..." A dialog will appear.
  3. Choose "Merge yours and theirs if no conflicts exist".
  4. Click Auto.

Can someone translate this into a p4 command line command with correct arguments?

Upvotes: 15

Views: 14521

Answers (4)

smalik
smalik

Reputation: 373

Use the following options for auto merge.

  • p4 resolve -am for accept merge.
  • p4 resolve -at for accept theirs.
  • p4 resolve -ay for accept yours.

Upvotes: 1

DeQuimet
DeQuimet

Reputation: 176

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#

Upvotes: 12

Eklavyaa
Eklavyaa

Reputation: 380

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

Upvotes: 1

akf
akf

Reputation: 39485

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.

Upvotes: 15

Related Questions