> BoltWire already has a conflict > resolution system in place for simultaneous edits. Try it and see if > it does not do what you want.
I tried it. The first edit was overwritten by the second, instead of both edits being merged automatically, and a box was inserted to tell me what had happened, to allow me to react to it. My first reaction is that this will not scale well, should more than one user notice the box, we get further simultaneous edits. I don't know if subversion would have decided that I was editing the same place or not, but it would either: a) have merged both edits (deleted text in one line according to the first edit, and removed a line according to the second edit) or b) asked the second user to merge the edits for it (if both edits edited the same parts of the text), before allowing the second user to commit his/her changes. On the whole, BoltWire3.0 is much stronger than i believed when it comes to simultaneous edits. I shall think more on the subject. ---- The undo action is much stronger than when I last checked. Add in a comment box to the edit action and it will be similar to how subversion keeps track of edits. It is essentially svn diff without the svn log functionality. I like. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "BoltWire" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/boltwire?hl=en -~----------~----~----~----~------~----~------~--~---
