| WMDE-Fisch | |
| Oct 11 2018, 3:57 PM |
| F26525368: Screenshot_2018-10-11 Edit conflict Main Page - EnLocalWiki.png | |
| Oct 11 2018, 3:57 PM |
If the one TwoColConflictHelper gets input that uses \n\r newlines and the other has \n lines the edit merge screens will give irritating solving screens.
This could be fixed by unifying the symbols.
Found while working on T195724 and currently a blocker since the above this seems to happen when I try to integrate the conflict view in the preview and diff page.
| Subject | Repo | Branch | Lines +/- | |
|---|---|---|---|---|
| Unify \r\n to \n newline chars in conflict helper | mediawiki/extensions/TwoColConflict | master | +76 -1 |
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Open | None | T72163 Edit conflicts (tracking) | |||
| Resolved | None | T139601 Better solutions to edit conflicts (#1) | |||
| Resolved | WMDE-Fisch | T195711 Make v2 of TwoColConflict: line based edit conflict handling | |||
| Resolved | thiemowmde | T195724 Adapt Save-, Preview- and Cancel buttons to new version (No. 8) | |||
| Resolved | WMDE-Fisch | T206770 Mixed newline chars irritate the TwoColConflictHelper |
To elaborate on that:
We see a change although the left and right side seem identical. - The reason behind that is, that one side uses \n line breaks and the other \n\r. For the differ this clearly is a change. - During the work done related to new line handling we assume at one place, that both sides either have \n or \n\r line breaks. This might be not always the case, as the example shows.
Since this happened during my experiments with including the merge view into the diff and the preview, we should go back to the reason why this is happening there when reviewing the patch there. But an improvement to get rid of that general assumption is still useful. - Sprint approval by @Lea_WMDE ;-)
Change 467406 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Unify \r\n to \n newline chars in conflict helper
Change 467406 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Unify \r\n to \n newline chars in conflict helper