[EMAIL PROTECTED] wrote:
On 10/11/07, Jörn Nettingsmeier <[EMAIL PROTECTED]> wrote:
while you're on the soapbox anyway, could you elaborate on how you are
going to merge (or avoid or whatever) simultaneous edits?
I expect the design will mature.
The first (current) version journals -- every save creates a new
revision. This avoids locking and ignores the merge problem without
losing data -- the "other" version is available, but any merging is
manual.
fair enough.
The next improvement will mark documents with unresolved branches.
Each revision has a parent revision. Admins will have a view to find
and fix documents with conflicts. A conflict document (translation)
has two revisions with the same parent.
Your design is the ultimate goal.
<snip>
Obviously this level of merging is not appropriate for every element
in every doctype:
ORIGINAL: <myElement employee="Paul" salary="100000"/>
EDIT1: <myElement employee="Paul" salary="200000"/>
EDIT2: <myElement employee="Jorn" salary="100000"/>
MERGE: <myElement employee="Jorn" salary="200000"/>
for some reason, i like this algorithm very much :-D
--
Jörn Nettingsmeier
"One of my most productive days was throwing away 1000 lines of code."
- Ken Thompson.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
