Re: [p4] Missed Integration
Sambwise <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'Sambwise'. Quote > With the last change to File A being the "change" in CL 123: > If we try and integrated changelist 123 it tells us there is nothing to integrate. > If we integrate head revision of the entire branch 1 to 2 it tells us this file needs to be integrated. > If we try to integrate just that file it tells us it needs to be integrated. It sounds like fileA@=123 is a change that does not need to be integrated, but there are earlier changes that do require integration. This statement was a little confusing to me: Quote > The files in question tend to be no-ops either the file had already been altered identically in the downstream branch or wasn't reverted on commit I am uncertain. but if the revision was a "no-op" this seems to support the theory that it's correct for an integration of that specific revision to not do anything. A Revision Graph screenshot that captures all the relevant information about all the revisions involved is often a good way to illustrate a scenario like this. If that's difficult to arrange, the "language" I've generally used for the past ten years in describing p4 integrate scenarios is itest [https://www.perforce.com/blog/i-test-you-test] . -- Please click here to see the post in its original format: http://forums.perforce.com/index.php?/topic/5528-missed-integration _______________________________________________ perforce-user mailing list - [email protected] http://maillist.perforce.com/mailman/listinfo/perforce-user