Author: ericwa
Date: Thu Mar 27 19:57:29 2014
New Revision: 10654

URL: http://svn.gna.org/viewcvs/etoile?rev=10654&view=rev
Log:
Update todo

Modified:
    trunk/Etoile/Frameworks/CoreObject/TODO.md

Modified: trunk/Etoile/Frameworks/CoreObject/TODO.md
URL: 
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/TODO.md?rev=10654&r1=10653&r2=10654&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/TODO.md  (original)
+++ trunk/Etoile/Frameworks/CoreObject/TODO.md  Thu Mar 27 19:57:29 2014
@@ -78,9 +78,15 @@
 
 - Something to aggregate the history of multiple persistent roots in this same 
class?
 
+- Attributed string merge needs work - doing a selective undo of an older 
change
+  tends to corrupt the document. We probably need different merge variants for 
collaborative
+  editing and (merging branches/selective undo)
+
 
 Open Questions
 --------------
+
+- Merging UI
 
 - We only have automatic metamodel-driven copying on subsets of an inner 
object graph. Investigate copying a persistent root and also referenced 
persistent roots. For example, being able to copy the Typewriter library 
persistent root, and have all note persistent roots in the library 
automatically copied as well, would be genuinely useful. This seems to be 
essentially the same problem we already solve with COCopier. Note that the 
persistent root copies would be essentially cheap copies, but we would have to 
rewrite the cross-references to point to the copies instead of the originals.
 


_______________________________________________
Etoile-cvs mailing list
Etoile-cvs@gna.org
https://mail.gna.org/listinfo/etoile-cvs

Reply via email to