Incomplete backout
Categories
(Developer Services :: Mercurial: mozext, defect)
Tracking
(Not tracked)
People
(Reporter: apavel, Unassigned)
Details
We had a backout for a build bustage:
https://treeherder.mozilla.org/jobs?repo=autoland&group_state=expanded&resultStatus=testfailed%2Cbusted%2Cexception%2Cretry%2Cusercancel&revision=e2b40064eb59e482de5cbf91e6f9270333175d15&selectedTaskRun=QK7ktNcxT8akVr0d0JWEgw.0
After the backout got landed here: https://hg.mozilla.org/integration/autoland/rev/8cd7e7e91bc41488f191cf6f2249594efe9187dc, when the developer tried to land the fix, had issues with it as the backout did not revert some changes:
this change did not get reverted in the backout
Lando error: https://lando.services.mozilla.com/D139817/
Landing requested on Sat, March 26, 2022, 7:20 PM GMT+2, by alissy@mozilla.com.
Revisions: D139816 diff 561112 ← D140742 diff 561113 ← D140744 diff 561114 ← D141109 diff 561115 ← D139817 diff 561116
The following files have a conflict with revision D139816:
ipc/glue/UtilityProcessManager.cpp @ 8cd7e7e91bc41488f191cf6f2249594efe9187dc
--- UtilityProcessManager.cpp
+++ UtilityProcessManager.cpp
@@ -264,11 +248,11 @@
if (!parent) {
return false;
}
return parent->SendRequestMemoryReport(aGeneration, aAnonymize,
- aMinimizeMemoryUsage, aDMDFile);
+ aMinimizeMemoryUsage, aDMDFile);
}
int32_t Pid() const override {
if (UtilityProcessParent* parent = GetParent()) {
return (int32_t)parent->OtherPid();
|
||
Comment 1•3 years ago
|
||
The indentation was against the coding style and modified code gets formatted automatically unless the mercurial extension gets turned off. The backout is 'modified code' and doesn't get reverted to its 'unformatted' state but a 'formatted' one.
Description
•