summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-16 16:55:40 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-16 16:55:40 -0400
commit4ed0a630cb8a10d583c5e88cc7a87a5cecdedc8d (patch)
tree19de75c7ae9732e984cf96e792907890485b4695 /doc
parent0150c5abe3e6fe2cd6edeb18d3cc2258290b2ed0 (diff)
two more cases
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/Moving_Pages.mdwn8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/todo/Moving_Pages.mdwn b/doc/todo/Moving_Pages.mdwn
index c37e5a611..38a5d3ad2 100644
--- 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 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.)