[Pywikibot-commits] [Gerrit] Restore edit conflict detection - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged. Change subject: Restore edit conflict detection ...................................................................... Restore edit conflict detection Edit conflict detection was deactivated in 8ea28f6f. Change-Id: I996d6b270ad8fab5d99696a76fb7102576bb6ca6 --- M pywikibot/site.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index b7d7ddc..0007ff9 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4069,6 +4069,9 @@ nocreate=nocreate, minor=minor, notminor=not minor and notminor) + if lastrev is not None: + params['basetimestamp'] = lastrev.timestamp + watch_items = set(["watch", "unwatch", "preferences", "nochange"]) if watch in watch_items: if MediaWikiVersion(self.version()) < MediaWikiVersion("1.16"): -- To view, visit https://gerrit.wikimedia.org/r/190756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I996d6b270ad8fab5d99696a76fb7102576bb6ca6 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Merlijn van Deen &lt;valhallasw(a)arctus.nl&gt; Gerrit-Reviewer: XZise &lt;CommodoreFabianus(a)gmx.de&gt; Gerrit-Reviewer: jenkins-bot <>