756448 - [compare-locales] merge content wrong with more than one error per file

Status: RESOLVED FIXED

(Mozilla Localizations :: Infrastructure, defect)

Description

[Axel Hecht [:Pike]]

Attachment: sort skips by start offset

The entries for skips in ContentComparer.merge were ordered per key, and not by file location. That means, the chunks to be removed for errornous values weren't sequenced, and thus the resulting file would be, say, non-optimal.

The fix is easy, just sort the thing by start offset.

I verified this by running over a few merge outputs which have errors on fx_central.

Comment 1

[Axel Hecht [:Pike]]

Comment on attachment 625083 [details] [diff] [review]
sort skips by start offset

Gandalf said he'd take a look at this, requesting review.

Comment 2

[Zibi Braniecki [:zbraniecki][:gandalf]]

Comment on attachment 625083 [details] [diff] [review]
sort skips by start offset

Review of attachment 625083 [details] [diff] [review]:
-----------------------------------------------------------------

looks and works good :)

Comment 3

[Axel Hecht [:Pike]]

http://hg.mozilla.org/l10n/compare-locales/rev/a36840ad87a1, FIXED.