Re: [p4] Missed Integration
Sambwise <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'Sambwise'. [https://forums.perforce.com/index.php?app=forums&module=forums§ion=findpost&pid=22624] DClyde, on 2017/11/06 18:53:25 UTC, said: > The reason that Feature#6 got merged to 1.18#2 is, at least from a graph standpoint, there was a change (Feature#5 which was an identical whitespace change) that _could_ have made Feature#6 different after integration conflict resolution from 1.15#7 such that it and 1.18#1 were not identical. > That's the thing, they can't be different -- the graph shows it was a "copy", which guarantees that they're identical. The metadata tracks this and the integration engine takes it into account, so even without looking at the file contents, it knows those revisions are the same and no integration is required. Diffing this and showing that they're identical confirms it, but you should always be able to assume that if one revision is a "copy into" another, the two are identical (at least in terms of raw content -- if filetypes differ or if there are evil +k keywords in there those are extra wrinkles that might show up in your diff, but for practical purposes integrate is still going to consider those files "identical" since that was the recorded intent of the previous 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