web commit by joey: conflict and merge is done!

1 files changed, 0 insertions, 20 deletions

diff --git a/doc/todo.mdwn b/doc/todo.mdwn
index 71c0eb972..30677fc42 100644
--- a/doc/todo.mdwn
+++ b/doc/todo.mdwn
@@ -1,25 +1,5 @@
 ## online page editing
 
-* Missing conflict detection, just overwrites changes and does not svn up
-  first..
-
-  How to resolve this? Would this work when saving a page?
-
-  1. write changes to wc
-  2. svn up (so it can merge with any other changes)
-  3. check for conflicts
-  4. if conflicts, read in page w/conflict markers, svn revert page, and display resolution form
-  5. otherwise, svn commit
-  6. if commit fails, perhaps we were raced and there are conflicts still; so check for conflicts and if found, goto 2.
-
-  No, it won't work, because the other committer updates the srcdir when they make their commit, so svn does not get a chance to merge in the changes on update in step 2. Hmm..
-
-  Well, it could keep track of the version number of the page it started editing, and if it's changed during the edit, ask svn to merge all changes from that version number to head into the page after writing it out. Doing that without races with other svn committers seems tricky.
-
-  If each commit operated in a separate copy of the wc, that was created for the commit, the steps above would work. But it would be very expensive to make and maintain all those copies.
-
-  Note that unless we use `svn lock`, we really can't "warn" about concurrent edits and such the way other wikis do, which is ok, since that system sucks anyway. Using svn up for smart merging will be much nicer most of the time.
-   
 * Eventually, might want page deletion.
 * Eventually, might want file upload.