You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2011/08/25 01:42:30 UTC

svn commit: r1161321 - /subversion/branches/1.7.x/STATUS

Author: danielsh
Date: Wed Aug 24 23:42:30 2011
New Revision: 1161321

URL: http://svn.apache.org/viewvc?rev=1161321&view=rev
Log:
* STATUS: Record a conflict (and its resolution) on the 1.7.x-fs-verify group.

Modified:
    subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1161321&r1=1161320&r2=1161321&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 24 23:42:30 2011
@@ -22,8 +22,9 @@ Candidate changes:
    Justification:
      Would be nice to extend verify already in 1.7.x.
    Notes:
-     This does not include progress reporting, since that is nominated
-     separately.
+     This does not include progress reporting; that has been postponed to 1.8.
+   Conflicts:
+     On fs_fs.c.  Resolve with 'theirs-conflict'.
    Votes:
      +1: rhuijben (only for 1.7.0) (without r1161164, r1161180)
      +1: danielsh