Rev 2884 completes a simple, robust, and extremely useful scheme to
recover from clone battles, no matter how they may arise.

This removes all the dread from the dreaded "node changed" messages.
It is easy to see what the changes were, and it is easy to choose
what, if anything to do.

It is easy to test the code to see how it works:

1. Put a clone in an external file, and put another clone in Leo
outside of any external file.

2. Change the clone outside of Leo using an external editor.

3. Reload Leo.

You will see a red message in the log pane.  You will also see a
"Recovered Nodes" node as the last top-level node.  This node has one
child per red message.  Each of these children contains two nodes: an
"old" node and a "new" node.  Unless there are multiple conflicts for
a single node, the "new" node will have "won": every clone contains
the new node's headline and body text.

Imo, this is a great day for Leo.  It would never have happened
without Gil's suggestions.

Edward

-- 
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