Sally

There are a couple of situations which end up "scheduling a resolve", i.e. marking a file as unresolved or needing to be resolved (ignoring branching/merging).

Scenario 1

--------------- 1.Fred syncs #3 (head rev at the time) and opens for edit. 2.Jim does the same but also submits - so head rev is now #4 3.Fred attempts a submit which fails, and the file in his workspace is scheduled to be resolved against #4 (head rev). 4.Fred resolves and submits successfully to give #5.

Scenario 2

--------------- As before for steps 1 &2 3. Fred does a sync - perforce detects conflict (because Fred has #3 opened for edit) and schedules a resolve against #4 4. as before

So a resolve can be scheduled by a failed submit or by a sync of an opened file.

The scenario you give is a variant of 1: 1.Fred syncs #3 (head rev at the time) and opens for edit. 2.Jim does the same but also submits - so head rev is now #4 3.Fred attempts a submit which fails, and the file in his workspace is scheduled to be resolved against #4. 4.Jo syncs #4, edits and submits to give #5. 5.Fred resolves against #4 and tries to submit. This fails because #5 is now head rev, and schedules a resolve against #5. 6. Fred resolves again (against #5) and submits successfully to give #6.

Having tested what p4win does in this situation, the second time Fred does a resolve it offers a dialog with the option to re-resolve a file. You can leave this option unchecked and click OK to get normal resolve dialog (his version against #5 in the above example). This is presumably because he has done one resolve (but not yet submitted it) and could chose either to re-resolve what he has already done, or carry on with next resolve. Yes it is slightly confusing.

As to when you might want to do a re-resolve, you might have made a mistake first time round and want to correct it before submitting it. The option isn't as useful as you might think since the re-resolve starts off with the file in your workspace, which may have been changed by the original resolve (it hasn't magically hidden a copy of the original file away somewhere and started again with that).

HTH Robert -----Original Message----- From: perforce-user-admin at perforce.com [mailto:perforce-user-admin at perforce.com]On Behalf Of Sally.Page at
symbian.com Sent: Monday, August 12, 2002 11:23 To: perforce-user at perforce.com Subject: [p4] re-resolve already resolved files

I've a user asking about resolving files in a changelist that are already resolved.

IE: he's resolved a file, because whilst he's had a file open for edit, someone else has submitted their change (fine). But before he gets around to submit, someone else edits and submits a change. Does this force him to re-resolve on submit? If so, the commentary in p4win kind of implies its not expecting this as it says upon resolving again - " Warning! file has already been resolved!" which to some I think would indicate there is nothing more to do... - but there is isn't there? ie. resolve his changes against the second submission that has happened to the file by someone else.

In the p4win translation guide, re-resolving is like doing a forced resolve "p4 resolve -f" but doesn't say why you might want to do this.

Any explanations would be grateful.

Sally Page Configuration Management Engineer Symbian (UK) Ltd Direct: 020 7563 2912 Mobile: 07769 588915