Merge commit 'intrigeri/pedigree'

[git.ikiwiki.info.git] / doc / todo / Moving_Pages.mdwn

diff --git a/doc/todo/Moving_Pages.mdwn b/doc/todo/Moving_Pages.mdwn
index c37e5a6111db8865c11be4f112824a8de9a705ba..38a5d3ad288c7247c6544a4c6d1944d8f5476e42 100644 (file)
--- a/doc/todo/Moving_Pages.mdwn
+++ b/doc/todo/Moving_Pages.mdwn
@@ -436,3 +436,11 @@ Cases that have to be dealt with:
 * Alice renames (or deletes) a page. In the meantime, Bob is uploading an
   attachment to it, and finishes after the rename finishes. Is it
   acceptible for the attachment to be saved under the old name?
 * Alice renames (or deletes) a page. In the meantime, Bob is uploading an
   attachment to it, and finishes after the rename finishes. Is it
   acceptible for the attachment to be saved under the old name?

+* Alice starts creating a new page. In the meantime, Bob renames a
+  different page to that name. Alice should get an error message when
+  committing; and it should have conflict markers. Ie, this should work the
+  same as if Bob had edited the new page at the same time as Alice did.
+* Bob starts renaming a page. In the meantime, Alice creates a new page
+  with the name he's renaming it to. Here Bob should get a error message
+  that he can't rename the page to an existing name. (A conflict resolution
+  edit would also be ok.)