How to remove reverted file from swarm review

Question

I created swarm review, then decided to revert some changes, so deleted files from corresponding CL. But files are still in swarm. There are two types of such files:

1. Files existed before i made my changes and i reverted it.
2. Files created during my changes and i deleted it.

How can i remove these both types from swarm review?

EDIT:

As i wasn't able able to remove file from swarm, i added this file reverted again to the CL and after this in swarm i have

And then i removed the file from the CL. And it continued to be in swarm.

Answer 1

You need to get the files right in your pending changelist's shelf. Presumably using P4V or p4 or whatever client you are using. Once the shelf (as well as the pending changelist) only contain the files it/they should, update the review.

Answer 2

First get you files right in the Changelist, using p4 revert. Then while you are shelving them again, use -r. It will replace the existing shelf with the current shelf completely. Normally it would do file by file, thus causing the issue for deleted files. Swarm will show the updated shelf after this.

p4 shelve -r -c 123456