svn commit: r1151970 - /subversion/site/publish/roadmap.html

[st...@apache.org]

Author: stsp
Date: Thu Jul 28 18:51:06 2011
New Revision: 1151970

URL: http://svn.apache.org/viewvc?rev=1151970&view=rev
Log:
* site/public/roadmap.html: Add conflict-storage to 1.8 items (not-started).
   Let's hope we'll get to it in this release cycle.

Modified:
    subversion/site/publish/roadmap.html

Modified: subversion/site/publish/roadmap.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/roadmap.html?rev=1151970&r1=1151969&r2=1151970&view=diff
==============================================================================
--- subversion/site/publish/roadmap.html (original)
+++ subversion/site/publish/roadmap.html Thu Jul 28 18:51:06 2011
@@ -490,6 +490,12 @@ numbering, compatibility, and deprecatio
         >Issue 3631</a></td>
   </tr>
   <tr class="task-level-1 not-started">
+    <td class="task-name">Conflict storage</td>
+    <td class="task-status">Not Started</td>
+    <td>Design spec is <a href="http://svn.apache.org/repos/asf/subversion/trunk/notes/wc-ng/conflict-storage"
+       >here</a>. Implementation was planned for 1.7 but didn't make it.</td>
+  </tr>
+  <tr class="task-level-1 not-started">
     <td class="task-name">Review of performance branch</td>
     <td class="task-status">Not Started</td>
     <td>Review items on the <a href="http://svn.apache.org/repos/asf/subversion/branches/performance/">performance branch</a>,