[p4] p4 resolve -as documentation incorrect?

[McNaught, Duncan]

Hi,

  I'm wanted to accept only really safe merges, and p4 resolve -as seems
to do this, but the documentation doesn't seem quite right,

It says "-as: Safe Accept. If either, but not both, of yours and theirs
is different from base, accept that revision. If both are different from
base, skip this file."

 

If you have a case where 1: The <fromfile> has changed twice since the
initial integration, <tofile> has had no changes and 2: You are
integrating only the second change in the second integration; it is not
accepted. This is good for a really safe merge since there may have been
some dependencies for the second change added in the first change.

 

In terms of the documentation only one file has changed from base (the
base being the original integrated file) so that would indicate the
merge should be accepted by -as - which is not what is happening.

 

Can you confirm my understanding of the safe accept?

Thanks

--Duncan

Intuit Eclipse SCM