[Gzz-commits] journals benja

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    journals
Changes by:     Benja Fallenstein <address@hidden>      03/05/24 14:59:50

Modified files:
        .              : benja 

Log message:
        look into versioning-- unsuccessfully. appears like we cannot version 
KWord documents feasibly

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/journals/benja.diff?tr1=1.48&tr2=1.49&r1=text&r2=text

Patches:
Index: journals/benja
diff -u journals/benja:1.48 journals/benja:1.49
--- journals/benja:1.48 Sat May 24 11:00:00 2003
+++ journals/benja      Sat May 24 14:59:50 2003
@@ -44,12 +44,24 @@
 Past:
 -----
 
-2003-05-24 [3.75h, 13.45-17.00]:
+2003-05-24 [4h, 13.45-17.00, 19.30-19.45, 20.00-]:
 
 - fix bug found by mudyc, where id checking
   wouldn't work correctly
 - implement creation of new pointers through
   Web interface
+- learn about KWord's file format: diffing
+  and merging appears to be infeasible. Thus, we
+  cannot demonstrate Storm for use on two different
+  computers easily. On the other hand, for
+  text-based files, these things are quite 
+  well-understood-- we'd only have to plug in a
+  standard diff-and-merge impl such as the ones
+  in the GNU tools. But who wants to edit text files
+  through Storm plus KDE? Argh.
+
+  OpenOffice.org has "Edit -> Compare Document...".
+  Doesn't seem trivial for us to use, though :-(
 
 2003-05-23 [14.30-15.00]: