X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2a07d81c90691baf6fd5f9a1380ce8c4864661d7..e6de0cfa62630a16e7c666cf6f603534b6f6e568:/doc/patchqueue/move_page.mdwn?ds=sidebyside diff --git a/doc/patchqueue/move_page.mdwn b/doc/patchqueue/move_page.mdwn index d7bc33e2a..3af49bbdb 100644 --- a/doc/patchqueue/move_page.mdwn +++ b/doc/patchqueue/move_page.mdwn @@ -21,6 +21,47 @@ A bunch of obvious shortcomings exist: Anyhow, here's the patch, for whatever good it does. +> Looks like a good start, although I agree about many of the points above, +> and also feel that something needs to be done about rcses that don't +> 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) + +> Probably, yes, but maybe there's a way to avoid duplicating code for that +> in several of them. + +Also, how should ikiwiki react if a page is edited (say, by another user) +before it is moved? Bail, or shrug and proceed? + +> The important thing is to keep in mind that the page could be edited, +> moved, deleted, etc in between the user starting the move and the move +> happening. So, the code really needs to deal with all of these cases in +> some way. It seems fine to me to go ahead with the move even if the page +> was edited. If the page was deleted or moved, it seems reasonable to exit +> with an error. +> +> Another set of issues exists if a separate web user is trying to edit the +> page at the same time. We'll have to make sure that something sane +> happens there; will ikiwiki re-add the moved page under the old name if +> the user saves their edit after the move? Could be confusing.. I think it +> probably errors out instead, but I'm not sure. Of course, this is an +> issue that occurs if the page is moved using a regular svn commit too, so +> it's not really your concern in a way. :-) + +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 + +> The working copy used by ikiwiki belongs to ikiwiki; it should not be +> edited directly. + diff -urx .svn ikiwiki/IkiWiki/CGI.pm ikiwiki-new/IkiWiki/CGI.pm --- ikiwiki/IkiWiki/CGI.pm 2007-01-04 03:52:47.000000000 -0800 +++ ikiwiki-new/IkiWiki/CGI.pm 2007-01-11 18:49:37.000000000 -0800