From 4e135c7f07932d8797b9416aa17969dc645a46e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Mon, 9 Mar 2020 18:45:28 +0100
Subject: [PATCH] Use 'baserevid' instead of 'basetimestamp' for edit conflict
 detection

This has two benefits:
* Allows detecting a conflict if two edits are saved in the same second
* Doesn't ignore conflicts with yourself (T246726)

Depends-On: Id7565018f66860b5c2ba688777508db1b88700ae
Bug: T246726
Change-Id: I22eaa1af5692854870d31e08b171a070a2fda0de
---
 modules/controller.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/controller.js b/modules/controller.js
index ee7cec8a2..409e8830c 100644
--- a/modules/controller.js
+++ b/modules/controller.js
@@ -168,7 +168,7 @@ function save( widget, parsoidData ) {
 				page: pageData.pageName,
 				oldid: pageData.oldId,
 				summary: summary,
-				basetimestamp: pageData.baseTimeStamp,
+				baserevid: pageData.oldId,
 				starttimestamp: pageData.startTimeStamp,
 				etag: pageData.etag,
 				assert: mw.user.isAnon() ? 'anon' : 'user',
@@ -302,7 +302,6 @@ function getParsoidCommentData( commentId ) {
 			parsoidPageData = {
 				pageName: pageName,
 				oldId: oldId,
-				baseTimeStamp: data.basetimestamp,
 				startTimeStamp: data.starttimestamp,
 				etag: data.etag
 			};