Here's a stopgap measure to survive 2 people editing the same .leo
file, with very little coding

- Suppose 2 people (A and B) have foo.leo open
- A edits node with gnx 1 and saves the document. A also adds a new
node with gnx 3.
- B edits node with gnx 2, but is alarmed that document has been saved
after he opened it, and leo suggests doing "File -> Merge changes"
- B does 'merge changes', which results in the xml of foo.leo being
parsed (but the document is NOT opened).
   - We note that there is a new node (with gnx 3). We also know the
headline. We just add the new node as a child under of a top level
"AUTOMERGE" node
   - We note that node with gnx 2 has been medified. If it's not
dirty, just update B's document. If it's dirty, add a new node or
conflict markers

And we are done!

Of course the merge can be generalized to merging from any file. This
should be easy to code, and can be done from a plugin.

-- 
Ville M. Vainio - vivainio.googlepages.com
blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio'

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"leo-editor" 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/leo-editor?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to