Change 5784

sam_stafford (Sam Stafford)
Sam Stafford committed this change into //guest/sam_stafford/scripts
Request Review
Download .zip
Improvements to p4rollback.pl:

1) -Dx flags rethought and rearranged to be more consistent
   with their meanings in "p4 integ".  The logic I'm
   following now is that a rollback is like integrating
   from before the bad change into the head rev.  Apologies
   to anyone who had gotten used to how the flags worked
   before.

2) Check to see if file is deleted at head rev.  If so, the
   -Dt flag can be used to re-add the "last good" rev as the
   new head rev, without a resolve.  (If you don't check for
   this and try to schedule the usual resolve, you end up
   getting stuck with an unsubmittable file, since you can't
   resolve an edit vs a delete.  Nasty.)

3) Files not in your client view will no longer be processed.
   (I made this change after noticing during testing that the
   "p4 files" command was hitting a remote depot -- confining
   the command to the client view makes that easy to dodge.)

Awesome.
  • Files 1
  • Comments 0
1 edited 0 added 0 deleted
p4rollback.pl#5
Loading...
Tip: Use n and p to cycle through the changes.