[Bps-public-commit] r11268 - in SVN-PropDB: doc

[jesse at bestpractical.com]

Author: jesse
Date: Sun Mar 30 02:43:48 2008
New Revision: 11268

Added:
   SVN-PropDB/doc/repository-layout
Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/doc/todo

Log:
 r28791 at 68-247-206-137:  jesse | 2008-03-29 20:43:13 -1000
 doc updates


Added: SVN-PropDB/doc/repository-layout
==============================================================================
--- (empty file)
+++ SVN-PropDB/doc/repository-layout	Sun Mar 30 02:43:48 2008
@@ -0,0 +1,10 @@
+SVN REPO
+    _prophet
+        _merge_tickets
+           remote-source-uuid
+                last-changeset: 1234 (changeset sequence no) 
+        $record_type
+            uuid-1234
+                this file's svn props are the record properties
+            uuid-1235
+            uuid-1236

Modified: SVN-PropDB/doc/todo
==============================================================================
--- SVN-PropDB/doc/todo	(original)
+++ SVN-PropDB/doc/todo	Sun Mar 30 02:43:48 2008
@@ -13,11 +13,13 @@
 
 Todo
 
+- ability to pull non-conflicting updates from a remote db
 - implement merge of conflicts with: "local always wins"
-
-
-
+- prompt for resolution of conflicts
+- record conflict resolution data 
+- reuse conflict resolution data on repeated resolve
 - ability to 'pull' conflicting updates from a remote db
-- base bug tracking schemb
-- elegant support for large attachments
+- handle conflicting conflict resolutions
+- base bug tracking schema
 - Replace this todo list with a svb database
+- elegant support for large attachments