Greg Spencer writes:

Ooops, exactly. Thanks for proofreading for me.

Your other point about using the filename explicitly in the resolve command is good, too, and would be necessary in a client workspace where other files were opened.

The caveats to my examples are therefore:

1. The client workspace must have no other opened files. If it does, you'll have to name the botched files in the resolve, sync, and submit commands so you don't affect other work in progress. (It's probably worth it to set up a separate client workspace for something like this, if you don't have one without opened files.)

2. The botched revs must be the head revs of the files in question. If you are backing out a rev previous to the head rev, you have to use 'resolve -am' so that subsequent changes don't also get backed out. You may have to use the editor if there were subsequent good changes affecting the same lines as the botched change.

---Laura

------------------------------------------------------------------------- Laura Wingerd Perforce Software, Inc. laura at perforce.com 510-864-7400

-------------------------------------------------------------------------