On Tue, 26 Oct 2004 17:22:00 -0400, Scott Abdey
<scott.abdey at dicecanada.com> wrote:
I'd like to implement a script to integrate portions of the remote depot,
edit the changelist description and submit.
Anyone ever try this from the command line...
p4 integrate //remote/directory1/... //local/directory1/...
p4 resolve -as
p4 resolve -am
p4 resolve
p4 change description="Integrating directory 1"
p4 submit
[ ... ]
I have a little script that does most of this. It has special
cases for files that should be accepted as is from 'theirs'.
It requests keyboard input when there's a conflict.
Having the 'p4 submit' in the script is a bad idea. You
should save the script's output and scan it carefully before
submitting. This could be automated, at the cost of
making the script much more complicated. There are a lot
of error cases to watch out for.