diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-16 05:10:02 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-16 05:10:02 +0000 |
| commit | 3b8c381829321f8c639bb8b49545bfca8f3fbaf3 (patch) | |
| tree | 50b87be105a9c9f37904968d9b629892b1dc0a6f | |
| parent | 04cde27a0e070af714826cf89071d27286d1d7fe (diff) | |
web commit by http://ethan.betacantrips.com/: long-winded reply
| -rw-r--r-- | doc/bugs/svn_fails_to_update.mdwn | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/doc/bugs/svn_fails_to_update.mdwn b/doc/bugs/svn_fails_to_update.mdwn index 1597ce6bc..fda003a44 100644 --- a/doc/bugs/svn_fails_to_update.mdwn +++ b/doc/bugs/svn_fails_to_update.mdwn @@ -51,3 +51,23 @@ but *does* happen when committing from the web. >>> You say that the rcs information for web commits is screwed up .. how? >>> Does this affect something that I'm not seeing? --[[Joey]] + +I just meant that when you call ikiwiki.cgi?do=edit, it gets the +"current" RCS revision, and uses that in the merges later if there +are other edits in the meantime. So I guess if you have a file a.mdwn, +and at revision X it contains the list: + + a + b + c + d + +And then one user edits it by removing "c" from web, and +then starts editing it again, ikiwiki.cgi will think the edit "started" +at revision X (although it's really X+1). So if another user edits via +web in the meantime, the subsequent merge will try to remove "c" again. +To be honest I don't know what will happen in this case (svn merge fails? +conflict markers?), but I'm pretty sure it's a problem. Anyhow, I think we +should call update manually after commit, I just don't know if this should +be RCS-specific, or whether it's safe to update after commit on all RCSes. +--Ethan
\ No newline at end of file |