[p4] Determining how files had been resolved after their submission

[Stephen Vance]

The Revision Graph uses the results of a filelog for that information, 
or at least you can. Do a 'p4 filelog' on the file in question and you 
will see things like "branch into" and "copy from" in the history. This 
is your branching history.

If your user did a "resolve -as" and only one of the files was changed, 
then Perforce would automatically chose -at or -ay. Those won't show up 
as conflicting, although they will show up with diffs.

In the end, the user is responsible for the correctness of their 
integrations. A good unit testing suite goes a long way to help that 
verification, but not everyone has that. Perforce gives you tools to 
make integrations easy. It also gives you tools to see what the user 
submitted. Unfortunately, it doesn't always let you know how they did 
what they did or why.

steve

Rob Love wrote:
> Hi,
>
>  
>
> I am trying to diagnose why some of our users have had recent
> difficulties with integrations. The symptoms are that edits have been
> made and successfully submitted to a "main" branch. The user then
> integrates their edits to a "release" branch. After submission we look
> at the history of a file that has been integrated and see that no
> changes have happened to the "release" version of the file, even though
> the changelist is shown as being submitted and a new version of the file
> created in the release branch. The users who have had these mysterious
> integrations tell me that they had the latest version of the release
> branch on their client machines, and that that did an auto resolve which
> did not show any conflicts. However the Revision Graph shows the dashed
> arrow where the integration took place and in the "Integration" tab says
> "ignored from". I believe this suggests the user did a "accept yours"
> (or -ay) for the resolve - hence no changes being made to the release
> branch version. 
>
>  
>
> After all that... my question is how does the Revision Graph gets its
> information about how a file got resolved - is there a P4 command
> equivalent that can tell me if a user used -am -ay or -at when the file
> was resolved? Are there any hints for deciphering what a user did in the
> past when performing and submitting integrations. Finally, could the
> above symptoms be the result of anything other than user error?
>
>  
>
> Many thanks
>
> Rob Love
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>   

-- 
Stephen Vance
www.vance.com