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

[gs...@apache.org]

Author: gstein
Date: Tue Aug 31 21:50:02 2010
New Revision: 991348

URL: http://svn.apache.org/viewvc?rev=991348&view=rev
Log:
* notes/wc-ng/conflict-store:
  (): some changes to how patch rejects are recorded

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=991348&r1=991347&r2=991348&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/conflict-storage (original)
+++ subversion/trunk/notes/wc-ng/conflict-storage Tue Aug 31 21:50:02 2010
@@ -256,19 +256,23 @@ is the failure to find a match for a hun
 There can be one or more reject conflicts on a node. Each "reject" conflict
 has the following form:
 
-  ("reject" HUNK_ORIGINAL_OFFSET HUNK_ORIGINAL_LEN
-    HUNK_MODIFIED_OFFSET HUNK_MODIFIED_LENGTH
-    REJECT_DIFF_SHA1)
+  REJECTED_HUNK_LIST := (HUNK_ORIGINAL_OFFSET HUNK_ORIGINAL_LENGTH
+                         HUNK_MODIFIED_OFFSET HUNK_MODIFIED_LENGTH)*
+
+  ("reject" REJECT_FILE TARGET_PATCH_SHA1 REJECTED_HUNK_LIST)
+
+REJECT_FILE is ...
+
+TARGET_PATCH_SHA1 is <selection of patch file applying to target>
+the sha1 of the unidiff content of the rejected
+hunk as written to the .svnpatch.rej file. The actual unidiff content
+(which can be large!) can be retrieved from the pristine store.
 
 HUNK_{ORIGINAL,MODIFIED}_OFFSET and HUNK_{ORIGINAL,MODIFIED}_LENGTH
 are the hunk header values as parsed from the patch file (i.e. the "ID"
 of the hunk within the patch file). These also occur in the reject
 diff text but are stored here for easy retrieval.
 
-REJECT_DIFF_SHA1 is the sha1 of the unidiff content of the rejected
-hunk as written to the .svnpatch.rej file. The actual unidiff content
-(which can be large!) can be retrieved from the pristine store.
-
 ### BH: Using a sha1 here, makes it impossible to cleanup the pristine store
 ###     The pristine store needs all references to be stored in a DB column.
 ###     To support this we would need an extra table.
@@ -277,3 +281,6 @@ hunk as written to the .svnpatch.rej fil
 ###   the user deletes the tempfile would be nice. And I don't see an issue
 ###   with also storing the SHA1 sum in the ACTUAL table. We do this for
 ###   text conflicts as well. Why would it need an extra table?
+
+  ("prop-reject" REJECT_FILE
+   (PROPERTY_NAME TARGET_PATCH_SHA1 REJECTED_HUNK_LIST)* )