From 53146f395cf979f93b9d53607d71993d1fbc7fed Mon Sep 17 00:00:00 2001 From: www-data Date: Sun, 19 Mar 2006 19:24:40 +0000 Subject: [PATCH] web commit by joey --- doc/todo.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo.mdwn b/doc/todo.mdwn index 6ea63829a..b6c38036d 100644 --- a/doc/todo.mdwn +++ b/doc/todo.mdwn @@ -12,6 +12,10 @@ 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. + 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. -- 2.26.2