Re: [p4] Missed Integration
DClyde <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'DClyde'. [https://forums.perforce.com/index.php?app=forums&module=forums§ion=findpost&pid=22596] Sambwise, on 2017/10/31 23:31:03 UTC, said: > 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. > It is my understanding that perforce requires an integration to occur to a file regardless of if there was a change or not. If it was committed, and then integrated even if the file is identical the record of the integration is needed. That Branch 2 is up to date as of Branch 1 commit 123. Even if there are changes that you do not want, you do the integration and then "Accept Mine" there is no "not doing anything." All of that said, bigger issue here isn't how I am resolving my integrations. It is that perforce is being inconsistent in its behavior. Given that the changelist in question is the last change to the file, and that the target branch was up to date before said changelist it should give me the same results in relation to that file regardless of which I do (assuming the same integration settings.) Integrating head for that file, integrating head for that branch, or integrating that changelist that happens to be head should all result in that file being in my local changelist an integrate. -- 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