From: joey Date: Mon, 19 Mar 2007 19:55:37 +0000 (+0000) Subject: another issue with the mercurual backend X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/b984d00921465ec778e59b750bc0e2366415e34c?ds=sidebyside another issue with the mercurual backend --- diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn index 0a20dd5b0..ff137a2e1 100644 --- a/doc/todo/mercurial.mdwn +++ b/doc/todo/mercurial.mdwn @@ -3,3 +3,10 @@ * Is the code sufficiently robust? It just warns when mercurial fails. * When rcs_commit is called with a $user that is an openid, it will be passed through to mercurial -u. Will mercurial choke on this? +* The rcs_commit implementation seems not to notice if the file has been + changed since a web edit started. Unlike all the other frontends, which + use the rcstoken to detect if the web commit started editing an earlier + version of the file, and if so, merge the two sets of changes together. + It seems that with the current mercurial commit code, it will always + blindly overwrite the current file with the web edited version, losing + any other changes.