Page MenuHomePhabricator

Section editing has edit rebase errors all day long
Closed, DuplicatePublic

Description

Twice in a row, my edits to an active page have been rebased incorrectly, so that "show changes" would have me throw away more recent edits than mine. I am using section editing, source mode.

Event Timeline

awight created this task.Jan 27 2016, 8:04 PM
awight raised the priority of this task from to Needs Triage.
awight updated the task description. (Show Details)
awight added a project: MediaWiki-General.
awight added a subscriber: awight.
Restricted Application added subscribers: StudiesWorld, Aklapper. · View Herald TranscriptJan 27 2016, 8:04 PM

steps to reproduce:

  • Open "edit source" for a section.
  • Make some changes.
  • Meanwhile, a second editor also edits and saves the article. Unknown if this is section or full-page editing.
  • First editor clicks "show changes."

The rendered diff will include the inverse of the second editor's changes, which is incorrect. The first editor's change should have been transparently rebased onto the latest revision.

Aklapper set Security to None.

Have you tried to save the page? Was the conflict resolved correctly? If this was just the "Preview changes" diff, this is a duplicate of T121185.

@awight: Could you please answer the last comment?

awight added a comment.Feb 8 2016, 3:56 PM

@matmarex
Thank you for pointing out the older bug--no, I didn't try saving the page until I had resolved the apparent conflicts.