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

[Wesley Hunt]

You can get an ignore integration even when the user does not choose
-ay when integrating--it keys off whether the file changed, not what
option the user chooses. If all the changes from the base are
identical in each branch, an auto-resolve will result in no change and
the filelog will contain "ignore". I ran into this while verifying a
policy where people were told to use meta-tags for "NULL" integrations
so users would be aware in the history. Causes were due to:

* cherry-picked change accidentally brought over changes from a
previous revision, and when the previous revision was integrated,
there was nothing to do

* changes done manually in each branch (tsk tsk)

* version numbers being bumped independently in each branch (actual
bug because the version really should have been bumped AGAIN when
integrating)

-Wes

On 10/17/07, Ed Mack <Ed.Mack at attachmate.com> wrote:
> A good practice for users is (always) to run a diff of the resolved
> revisions against the server, before submitting the files.  This way,
> you can catch oddities before changelists are submitted.
>
> Ed
>
> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Rob Love
> Sent: Wednesday, October 17, 2007 3:30 AM
> To: perforce-user at perforce.com
> Subject: [p4] Determining how files had been resolved after their
> submission
>
> 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
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>