subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1376906 - /subversion/site/publish/roadmap.html
Date Fri, 24 Aug 2012 13:34:55 GMT
Author: cmpilato
Date: Fri Aug 24 13:34:55 2012
New Revision: 1376906

URL: http://svn.apache.org/viewvc?rev=1376906&view=rev
Log:
Update 'Conflict storage' roadmap status.

Modified:
    subversion/site/publish/roadmap.html

Modified: subversion/site/publish/roadmap.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/roadmap.html?rev=1376906&r1=1376905&r2=1376906&view=diff
==============================================================================
--- subversion/site/publish/roadmap.html (original)
+++ subversion/site/publish/roadmap.html Fri Aug 24 13:34:55 2012
@@ -313,7 +313,10 @@ numbering, compatibility, and deprecatio
     <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>
+       >here</a>. Implementation was planned for 1.7 but didn't make it.
+       rhuijben <a href="http://svn.haxx.se/dev/archive-2012-08/0220.shtml"
+       >says</a> that "the skel based conflict storage work is complete,
+       but needs a working copy format bump to be enabled."</td>
   </tr>
   <tr class="task-level-1 deferred">
     <td class="task-name">Commit shelving / checkpointing</td>



Mime
View raw message