Author: julianfoad
Date: Fri Aug 21 11:00:28 2015
New Revision: 1696932
URL: http://svn.apache.org/r1696932
Log:
On the 'move-tracking-2' branch: Update BRANCH-README and 'svnmover
help'.
* BRANCH-README
Mention some more things to do. Remove non-nested (top-level) branching
from the to-do list, as it is now mainly done.
* subversion/svnmover/svnmover.c
(usage): Update the help text, both to mention the new ^B<branch-id>
syntax and generally.
Modified:
subversion/branches/move-tracking-2/BRANCH-README
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified: subversion/branches/move-tracking-2/BRANCH-README
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/BRANCH-README?rev=1696932&r1=1696931&r2=1696932&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/BRANCH-README (original)
+++ subversion/branches/move-tracking-2/BRANCH-README Fri Aug 21 11:00:28 2015
@@ -96,8 +96,16 @@ Work on this branch:
"switch" command
+ "mktbranch" -- make a new (empty, unrelated) top-level branch
+
+ "rmtbranch" -- remove a top-level branch
+
Bigger things to do:
+ Concept of a "branch" as having ancestry. It should be possible
+ to trace from a current branch back past branching points to a
+ historical version in a branch it was branched from.
+
"Replay" API: convert committed changes to an edit drive
* A txn must keep track of which EIDs in it were previously
@@ -133,10 +141,6 @@ Work on this branch:
- This may help with prototyping by allowing easier connection to
external scripts etc.
- Provide a way to create and access branches of the repo root branch
- that are outside the default repository paths name-space.
- - This style of whole-repo branching closely matches most DVCSs.
-
Persist WC on disk.
Tidying things to do:
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1696932&r1=1696931&r2=1696932&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Fri Aug
21 11:00:28 2015
@@ -3112,13 +3112,20 @@ usage(FILE *stream, apr_pool_t *pool)
_("usage: svnmover -U REPO_URL [ACTION...]\n"
"A client for experimenting with move tracking.\n"
"\n"
- " Perform URL-based ACTIONs on a Subversion repository, committing
the\n"
- " result as a (single) new revision, similar to svnmucc.\n"
+ " Commit a batch of ACTIONs to a Subversion repository, as a single\n"
+ " new revision. With no ACTIONs specified, read actions
interactively\n"
+ " from standard input, until EOF or ^C, and then commit the result.\n"
"\n"
- " With no ACTIONs, read actions interactively from standard input,
making\n"
- " one commit for each line of input.\n"
+ " Action arguments are of the form\n"
+ " [^B<branch-id>/]<path>[@<revnum>]\n"
+ " where\n"
+ " <branch-id> defaults to the working branch or, when <revnum> is\n"
+ " given, to the base branch\n"
+ " <path> is a path relative to the branch\n"
+ " <revnum> is the revision number, when making a historic
reference\n"
"\n"
- " Store move tracking metadata either in local files or in revprops.\n"
+ " Move tracking metadata is stored in the repository, in on-disk
files\n"
+ " for RA-local or in revprops otherwise.\n"
"\n"
"Actions:\n"),
stream, pool));
