[p4] P4V and check out of a binary file not at latest revision

[Chuck Karish]

On 4/12/07, Francis Paulin <francis.paulin at ubisoft.com> wrote:
> If the user accepts "yours" he/she will loose changes from revision #8,
> #9 and #10 overwriting them with revision #7 + his/her changes done to
> the file.
>
> If the user accepts "theirs" he/she will lose all modifications done on
> the binary file. Therefore, if submitted, the revision #11 will be an
> exact copy of revision #10. Oops :o).

The first question to answer is what does it take to create a version of the
file with the correct contents.  If the file in the user's workspace is correct,
'accept yours' is the right thing to do.

-- 
Chuck Karish   karish at well.com   (415) 317-0182