Re: [Wikitech-l] External editor with merge capability?

2010-03-05 Thread Roan Kattouw
2010/3/5 Jani Patokallio jpato...@iki.fi: Right, this was also my understanding of how it worked internally, the question is how to work around this?  Eg. the API offers basetimestamp and starttimestamp fields that can be sent along with the edit submission, but is there any way to send these

[Wikitech-l] External editor with merge capability?

2010-03-04 Thread Jani Patokallio
Greetings, There are a whole bunch of external editors for Mediawiki, but are any of them capable of merging/diffing changes instead of simply overwriting *if* the session is closed in the meantime? That is, if: 1) I open an article externally (v1) 2) Somebody else changes the article (v2a) 3)

Re: [Wikitech-l] External editor with merge capability?

2010-03-04 Thread Roan Kattouw
2010/3/4 Jani Patokallio jpato...@iki.fi: Greetings, There are a whole bunch of external editors for Mediawiki, but are any of them capable of merging/diffing changes instead of simply overwriting *if* the session is closed in the meantime?  That is, if: 1) I open an article externally (v1)

Re: [Wikitech-l] External editor with merge capability?

2010-03-04 Thread Jani Patokallio
Thanks for the reply, and I stand corrected on MW's ability to merge versions. However: Date: Fri, 5 Mar 2010 00:03:13 +0100 From: Roan Kattouw roan.katt...@gmail.com Subject: Re: [Wikitech-l] External editor with merge capability? To decide whether you've seen a certain change, MediaWiki