Closed
Bug 797905
Opened 12 years ago
Closed 12 years ago
Rescue buildbot-config patches that aren't on production but production doesn't think it needs to merge
Categories
(Release Engineering :: General, defect)
Release Engineering
General
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: philor, Assigned: rail)
References
Details
(Whiteboard: [buildduty])
Merging's black magic to me, but according to bug 786516 comment 11 the reason several things that were already committed before Monday's reconfig didn't actually happen is because an earlier merge made them look like they'd already been merged when they hadn't.
Comment 1•12 years ago
|
||
Oh, removing bug 786177 again as that was done manually.
No longer blocks: 786177
Assignee | ||
Updated•12 years ago
|
Assignee: nobody → rail
Assignee | ||
Comment 2•12 years ago
|
||
I inspected the output of "hg diff -r default -r production" and figured out the problematic changesets: 680736f2dc1f 6425c62b2364 680736f2dc1f 02e467e82c33 For every single changesets I ran the following on production: hg export $c | hg import - ; hg commit -n " Merge $c for reals" Additionally, 129bbc93bdd2 was landed on production only, I transplated it. And finally I merged (noop) default -> production. $ hg diff -r default -r production --stat .hgtags | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) \o/
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Updated•11 years ago
|
Product: mozilla.org → Release Engineering
You need to log in
before you can comment on or make changes to this bug.
Description
•