You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/07/10 00:39:44 UTC
svn commit: r1690184 -
/subversion/branches/svn-mergeinfo-normalizer/BRANCH-README
Author: stefan2
Date: Thu Jul 9 22:39:44 2015
New Revision: 1690184
URL: http://svn.apache.org/r1690184
Log:
On the svn-mergeinfo-normalizer branch:
* BRANCH-README: Update.
Modified:
subversion/branches/svn-mergeinfo-normalizer/BRANCH-README
Modified: subversion/branches/svn-mergeinfo-normalizer/BRANCH-README
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/BRANCH-README?rev=1690184&r1=1690183&r2=1690184&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/BRANCH-README (original)
+++ subversion/branches/svn-mergeinfo-normalizer/BRANCH-README Thu Jul 9 22:39:44 2015
@@ -11,10 +11,7 @@ Features implemented:
The user may then explicitly merge those sub-tree specific changes
and retry afterwards.
-* clear-obsoletes
- Removes all mergeinfo for branches that don't exist in HEAD.
-
-* normalize
+* normalize --remove-redundant
Removes all mergeinfo from a node, if *all* of it is either
- redundant with the parent contents
(same ranges for the respective branches)
@@ -28,15 +25,17 @@ Features implemented:
"parent" means the next higher node in the working copy that also
has mergeinfo on it.
-* combine-ranges
- Combines neighboring ranges if they are compatible (same "inheritable"
- flag) and the revisions in between are inoperative on the respective
- path.
+* normalize --remove-obsolete
+ Remove mergeinfo for branches that no longer exist repo@HEAD.
+
+* normalize --combine-ranges
+ Combine adjacent revision ranges if any separating revisions are
+ inoperative on the respective sub-tree.
+
+* remove-branches
+ Remove mergeinfo referring to the given branches from the working copy.
TODO:
-* Proper documentation (docstrings etc.)
-* Progress output
-* Remove redundant code
-* Decide upon sub-command set / granularity
+* Proper docstrings
* Verify that results are actually equivalent to original state