On the 'tree-api' branch: Update BRANCH-README.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/tree-api@1831326 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/BRANCH-README b/BRANCH-README
index 3d84e6e..d905ca5 100644
--- a/BRANCH-README
+++ b/BRANCH-README
@@ -1,7 +1,10 @@
-This 'tree-read-api' branch is a feature branch to develop a new API.
+This 'tree-api' branch is a feature branch to develop a new API.
As a 'feature' branch, it is maintained by periodic 'catch-up' (aka
'sync') merges from trunk, and may one day be reintegrated to trunk.
+See:
+ https://cwiki.apache.org/confluence/display/SVN/Common+Tree+Interfaces
+
The new API is an abstraction of a generic tree of (usually) versioned
nodes -- where each node is a file or directory, with properties. We
already have a generic tree-editing API (svn_delta_editor_t,
@@ -22,8 +25,3 @@
of doing this by writing several more variants of the current three
subroutines (WC/WC, WC/repos, repos/repos), in principle we would need
just one diff subroutine that takes two Tree objects as input.
-
-Another goal here is to facilitate writing a three-way merge that fully
-supports moves and renames.
-
-- Julian Foad, November 2012
