Closed Bug 1571755 Opened 4 months ago Closed 3 months ago

Add a command to merge updated ini files

Categories

(Testing :: web-platform-tests, task)

task
Not set

Tracking

(firefox70 fixed)

RESOLVED FIXED
mozilla70
Tracking Status
firefox70 --- fixed

People

(Reporter: jgraham, Assigned: jgraham)

Details

Attachments

(1 file)

The wpt-sync bot has a problem where it tries to cherry pick a change which update ini files and ends up with merge conflicts. We don't necessarily need to resolve these perfectly but we do need to provide a resolution automatically since otherwise it blocks syncs. Since the ini parser is in-tree we want to make this an in-tree command that the sync can use to provide the resolution.

The general strategy is that we want to prefer the "new" metadata where possible. This won't always be correct e.g. if a test got fixed on master and simultaneously got edited to go from TIMEOUT to FAIL in a browser without the fix. But it's not a bad approximation (and generally a human will struggle to do the merge better by hand, so we have to assume later try jobs will fix things).

This command is inteded to be usable as a git mergetool for the
specific case of merging ini files in a way that should always
succeed, produces reasonably likely output, but isn't reliably
correct.

The main use case is for the sync bot where we update metadata on
branches and experience conflicts when we also have changes on
master. We don't necessarily need to resolve these perfectly but we do
need to provide a resolution automatically since otherwise it blocks
syncs. Since the ini parser is in-tree we want to make this an in-tree
command that the sync can use to provide the resolution.

The general strategy is that we want to prefer the "new" metadata
where possible. This won't always be correct e.g. if a test got fixed
on master and simultaneously got edited to go from TIMEOUT to FAIL in
a browser without the fix. But it's not a bad approximation (and
generally a human will struggle to do the merge better by hand, so we
have to assume later try jobs will fix things).

Pushed by james@hoppipolla.co.uk:
https://hg.mozilla.org/integration/autoland/rev/b60857a1f7a9
Add a command for merging wpt metadata, r=maja_zf
Status: NEW → RESOLVED
Closed: 3 months ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla70
Failed to create upstream wpt PR for this bug due to merge conflicts. This requires fixup from a wpt sync admin.
Failed to create upstream wpt PR for this bug due to merge conflicts. This requires fixup from a wpt sync admin.
Flags: needinfo?(wptsync)
Failed to create upstream wpt PR for this bug due to merge conflicts. This requires fixup from a wpt sync admin.
Flags: needinfo?(wptsync)
Failed to create upstream wpt PR for this bug due to merge conflicts. This requires fixup from a wpt sync admin.
Flags: needinfo?(wptsync)

This change was already upstream.

Flags: needinfo?(wptsync)
You need to log in before you can comment on or make changes to this bug.