- milestone changed from 0.11 to 1.0
0.11 is already a big improvement over 0.10 w.r.t. concurrent edits. Please try it out (TracDownload) and tell us what you think.
Now, in 0.11, the behavior is slightly different between wiki and ticket. In the solution used for wiki, we show a diff between the version you were about to save and the newer one someone managed to save before.
When there's a conflict for ticket editing, we also inform the user about the conflict and show what would be different from the newer ticket version, but:
- we don't distinguish between the changes made by the other that we're simply reverting from those we're in conflict with, or the changes that "apply cleanly"
- we don't show a diff for description or other text fields changes
- we don't offer a way for the user to simply update her modifications and make the change happen; instead she has to save her comment (copy/paste), reload the ticket, redo the changes
So there's obviously still some room from improvement (as mentioned in the original #4100 ticket).
