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 20:30:21 UTC
svn commit: r929653 - /subversion/trunk/notes/wc-ng/conflict-storage
Author: julianfoad
Date: Wed Mar 31 18:30:21 2010
New Revision: 929653
URL: http://svn.apache.org/viewvc?rev=929653&view=rev
Log:
* notes/wc-ng/conflict-storage: Remove target repos from the 'switch' case,
as a switch could never be to a different repository.
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=929653&r1=929652&r2=929653&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/conflict-storage (original)
+++ subversion/trunk/notes/wc-ng/conflict-storage Wed Mar 31 18:30:21 2010
@@ -59,10 +59,9 @@ To record an "update" operation, the ske
For "switch", the skel has the form:
- ("switch" BASE_REV TARGET_REV REPOS_ROOT_URL REPOS_RELPATH)
+ ("switch" BASE_REV TARGET_REV REPOS_RELPATH)
BASE_REV and TARGET_REV are as for "update" above.
- REPOS_ROOT_URL is the repository root of the URL being switched to.
REPOS_RELPATH is the path in the repository being switched to.
For "merge", the skel has the form: