Rietveld and git reporting different committed code [diff]. |
||||
Issue descriptionI recently landed two CLs: 1) https://codereview.chromium.org/2649973003/ [Add files A/B] 2) https://codereview.chromium.org/2650363002/ [Update A/B] (2) is dependent on (1). (2) caused a compile failure on an ASAN bot, but the sheriff incorrectly reverted (!). To everyone's surprise, the revert landed: 3) https://codereview.chromium.org/2658083002/ However, if you look at what rietveld claims is contained in this CL [both by diff, or just file by file], it's different from what git claims was landed: See hash e9942e23fec9e2bca8ebd70f79feb2120943b54b. I think what's happened here is that rietveld uploads a diff, which may or may not represent the actual patch that we try to land on trunk, which presumably just deletes A and B, without looking to see if the diff matches. This seems dangerous, since (2) has effectively been reverted, but it's very hard to tell that this is the case from looking at rietveld.
,
Jan 26 2017
I suspect this might be a side-effect of applying the patch via 3-way merge, but I'd like to see how the patch was applied and all the "apply / git am" args.
,
Jan 26 2017
,
Jan 30 2017
As this is a Pri-3, it is unlikely to be fixed as we are moving everyone to PolyGerrit (https://polygerrit.appspot.com). Stay tuned for your dogfooding email coming this quarter.
,
Feb 1 2017
I think this is not about polygerrit or emails, this is about applying the diff on the CQ.
,
Aug 4 2017
Closing in bulk due to Rietveld’s deprecation in favor of Gerrit. If you feel this bug should not have been closed, please feel free to re-open. |
||||
►
Sign in to add a comment |
||||
Comment 1 by primiano@chromium.org
, Jan 26 2017