Jump to content


Elad

Member Since 23 Jul 2019
Offline Last Active Aug 04 2019 06:13 AM
-----

Topics I've Started

Custom tool to get latest revision from depot and resolve files

23 July 2019 - 06:09 AM

I'm working on files that are being changed frequently in the depot, so I'm trying to add a custom tool that will let me select multiple checked out files in a changelist and for each one will automticaly:
1. get latest revision from deopt
2. resolve it with merging (skip if there is conflict)

For that I created the file 'GetLatestAndResolve.bat' with these commands:

p4 sync %1#head
p4 resolve -a %1

Then I added a custom tool that calls to the above file and passes %d as argument.

I have 2 questions:

1. If I select multiple files and use the custom tool I created, only one file is being processed, what I'm missing?

2. What's the different between
resolve -a
and
resolve -am
?
both should resolve with merging and skip if there is conflict.