HomePhabricator

(bug 1150) Do not skip edit conflict and override just because editing user was…

Authored by aaron.

Description

(bug 1150) Do not skip edit conflict and override just because editing user was the last to edit. This caused removal of edits if a user edit conflicts, merges/automerges, then presses back (such as fixing a typo) and saves again. Check all users since edit time instead. If they are *all* the editing user, then go ahead and skip.

Details

Committed
aaronOct 13 2008, 2:48 PM
Parents
rMW5688ff12c872: Fixed getSlavePos() to use the SQL thread fields, not the IO thread fields.
Branches
Unknown
Tags
Unknown
ChangeId
None