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

Posted to commits@subversion.apache.org by ju...@apache.org on 2010/03/31 16:58:27 UTC

svn commit: r929565 - /subversion/trunk/notes/wc-ng/conflict-storage

Author: julianfoad
Date: Wed Mar 31 14:58:27 2010
New Revision: 929565

URL: http://svn.apache.org/viewvc?rev=929565&view=rev
Log:
* notes/wc-ng/conflict-storage: Add a note about REV vs. PEG_REV.

Modified:
    subversion/trunk/notes/wc-ng/conflict-storage

Modified: subversion/trunk/notes/wc-ng/conflict-storage
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/wc-ng/conflict-storage?rev=929565&r1=929564&r2=929565&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/conflict-storage (original)
+++ subversion/trunk/notes/wc-ng/conflict-storage Wed Mar 31 14:58:27 2010
@@ -83,6 +83,9 @@ For merge:
   {LEFT,RIGHT}_PEG_REV is the peg revision of the {left,right} version
     of the item.
 
+### JAF: Don't want both "rev" and "peg-rev" separately: that's recording too
+###   much UI.  Just have the revision in which to find the repos-relpath.
+
 For patch: (PATCH_FILE_ABSPATH)
 
   PATCH_FILE_ABSPATH is the absolute path of the patch file the