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

[rh...@apache.org]

Author: rhuijben
Date: Wed Jun 27 11:19:44 2012
New Revision: 1354428

URL: http://svn.apache.org/viewvc?rev=1354428&view=rev
Log:
* notes/wc-ng/conflict-storage-2.0
  (PATH_REV): Use full repository location in skel to make building and reading
    conflicts easier.
  (EOF): At newline at end of file.

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

Modified: subversion/trunk/notes/wc-ng/conflict-storage-2.0
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/wc-ng/conflict-storage-2.0?rev=1354428&r1=1354427&r2=1354428&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/conflict-storage-2.0 (original)
+++ subversion/trunk/notes/wc-ng/conflict-storage-2.0 Wed Jun 27 11:19:44 2012
@@ -67,9 +67,15 @@ Where 'WHY' would tell why the conflict 
 WHY = (OPERATION (PATH_REV*) ...)
 
 OPERATION = "update" | "switch" | "merge" | ...
-PATH_REV = ("subversion" repos_id repos_relpath revision kind ...) | () | ...
+PATH_REV = ("subversion" repos_root_url repos_uuid repos_relpath revision kind
+             ...) | () | ...
 
-repos_id, repos_relpath, revision and kind are defined as in wc-metadata.sql.
+repos_root_url, repos_uuid, repos_relpath, revision and kind are defined as in
+wc-metadata.sql or more general through libsvn_wc. We could have used a
+repos_id at a performance cost, but since we don't update the url for an
+existing repos_id on relocate it doesn't help us in keeping the database
+stable over relocates anyway. The skel format would allow switching to
+this format in a future version if we want to keep the conflicts valid.
 
 "update" and "switch" will have 1 PATH_REV item, containing the original BASE
 path from before the update/switch. The new location is already available in
@@ -169,4 +175,4 @@ The current svn info behavior can be reu
 where it applies to the WHY parts.
 
 It would be nice if some other --accept values would be accepted, but that
-is outside the scope of this design.
\ No newline at end of file
+is outside the scope of this design.