summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-24 02:37:15 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-24 02:37:15 +0000
commit1c54cdb497e6e6987cfc0c5133944f9b554f9ad3 (patch)
tree6334b4952dd71a9704b762905e6ce714837a0228 /doc
parente6b7dcd47b22c6bce1ac89e0538f6ba44edd0b3f (diff)
web commit by http://ethan.betacantrips.com/: obsolete comment about moving/edit conflicts
Diffstat (limited to 'doc')
-rw-r--r--doc/patchqueue/move_page.mdwn10
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/patchqueue/move_page.mdwn b/doc/patchqueue/move_page.mdwn
index 3c96fde3e..21be9ba6b 100644
--- a/doc/patchqueue/move_page.mdwn
+++ b/doc/patchqueue/move_page.mdwn
@@ -41,16 +41,6 @@ before it is moved? Bail, or shrug and proceed?
> 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. :-)
-
->> I wrote a seperate patch to address this -- it's in [[disappearing_pages]]. --Ethan
diff -urNX ignorepats ikiwiki/IkiWiki/CGI.pm ikidev/IkiWiki/CGI.pm
--- ikiwiki/IkiWiki/CGI.pm 2007-02-14 18:17:12.000000000 -0800