1375966 - Perform content check against different revision

Status: RESOLVED FIXED

(Developer Services :: Servo VCS Sync, enhancement)

Description

[Gregory Szorc [:gps]]

Will be explained in commit to follow.

Comment 1

[Gregory Szorc [:gps]]

Attachment: overlay: change content checking in non-contiguous mode (bug 1375966);

Before this change, non-contiguous mode compared content against the
last overlayed changeset. Since we're skipping changesets in
non-contiguous mode, this check would almost certainly fail. The
(current) goal in non-contiguous mode is to support backouts. The
skipped changeset will be a backout. The first parent of the first
changeset to be overlayed should be the backout. So, for non-contiguous
mode, we change the content check to be against the first parent.

This isn't a complete fix. If the first parent isn't the backout, then
the content check will fail. But this is presumed to be true most of
the time for the current Servo backout system. Perfect is the enemy of
good.

Review commit: https://reviewboard.mozilla.org/r/152292/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/152292/

Comment 2

[Steven MacLeod [:smacleod]]

Comment on attachment 8880922 [details]
overlay: change content checking in non-contiguous mode (bug 1375966);

https://reviewboard.mozilla.org/r/152292/#review157340

Looks good, thanks for handling this.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/aa77c441ae78
overlay: change content checking in non-contiguous mode ; r=smacleod