From: joey Date: Sun, 14 Jan 2007 08:16:09 +0000 (+0000) Subject: web commit by http://ethan.betacantrips.com/ X-Git-Tag: 1.40~10 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c87c7edf288ca69e96721ed6ff46f12b7f478540 web commit by http://ethan.betacantrips.com/ --- diff --git a/doc/patchqueue/move_page.mdwn b/doc/patchqueue/move_page.mdwn index e3109f062..fcf416a4a 100644 --- a/doc/patchqueue/move_page.mdwn +++ b/doc/patchqueue/move_page.mdwn @@ -26,6 +26,21 @@ Anyhow, here's the patch, for whatever good it does. > implement a move operation -- falling back to an add and delete. > --[[Joey]] +Hmm. Shouldn't that be done on a by-RCS basis, though? (i.e. implemented +by backends in the `rcs_move` function) + +Also, how should ikiwiki react if a page is edited (say, by another user) +before it is moved? Bail, or shrug and proceed? + +Could you elaborate on [[commit-internals]]? Can I assume that ikiwiki's +working copy W will always reflect a revision of the master copy M? +(That is, nobody changes W and leaves it uncommitted.) I would guess +probably not; a user probably expects that if he starts editing W it +won't get randomly committed by web user actions. But then looking at +the svn backend, it looks like if I edit foo.mdwn, don't commit, and then +a web user makes different changes, my changes get wiped out. So does +W "belong" to ikiwiki? --Ethan + diff -urx .svn ikiwiki/IkiWiki/CGI.pm ikiwiki-new/IkiWiki/CGI.pm --- ikiwiki/IkiWiki/CGI.pm 2007-01-04 03:52:47.000000000 -0800