From d29ca65cee7693244d9df529e373276d27d48a2a Mon Sep 17 00:00:00 2001 From: Tony Duckles Date: Thu, 27 Sep 2012 01:01:04 -0500 Subject: [PATCH] Minor documentation tweaks * svn2svn/run/svnreplay.py: Minor tweaks to the documentation for some of the command-line args. * README.mkd: Sync with the latest "--help" contents. --- README.mkd | 7 ++++--- svn2svn/run/svnreplay.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.mkd b/README.mkd index a81fb2c..86de839 100644 --- a/README.mkd +++ b/README.mkd @@ -57,7 +57,7 @@ Usage See `svnreplay.py --help`: $ ./svnreplay.py --help - svn2svn, version 1.6.0 + svn2svn, version 1.7.0 Usage: svnreplay.py [OPTIONS] source_url target_url @@ -104,12 +104,12 @@ See `svnreplay.py --help`: (REQUIRES 'pre-revprop-change' hook script to allow 'svn:date' changes.) -P, --keep-prop Maintain same file/dir SVN properties as source. - -R, --keep-revnum Maintain same rev #'s as source. creates placeholder + -R, --keep-revnum Maintain same rev #'s as source. Creates placeholder target revisions (by modifying a 'svn2svn:keep-revnum' property at the root of the target repo). -c, --continue Continue from last source commit to target (based on svn2svn:* revprops). - -f, --force Allow replaying into a non-empty target folder. + -f, --force Allow replaying into a non-empty target-repo folder. -r, --revision=ARG Revision range to replay from source_url. A revision argument can be one of: START Start rev # (end will be 'HEAD') @@ -129,6 +129,7 @@ See `svnreplay.py --help`: after every target commit or last target commit. --pre-commit=CMD Run the given shell script before each replayed commit, e.g. to modify file-content during replay. + Called as: CMD [wc_path] [source_rev] --debug Enable debugging output (same as -vvv). Side Effects diff --git a/svn2svn/run/svnreplay.py b/svn2svn/run/svnreplay.py index 71194cd..b86ad10 100644 --- a/svn2svn/run/svnreplay.py +++ b/svn2svn/run/svnreplay.py @@ -1043,12 +1043,12 @@ Examples: parser.add_option("-P", "--keep-prop", action="store_true", dest="keep_prop", default=False, help="Maintain same file/dir SVN properties as source.") parser.add_option("-R", "--keep-revnum", action="store_true", dest="keep_revnum", default=False, - help="Maintain same rev #'s as source. creates placeholder target " + help="Maintain same rev #'s as source. Creates placeholder target " "revisions (by modifying a 'svn2svn:keep-revnum' property at the root of the target repo).") parser.add_option("-c", "--continue", action="store_true", dest="cont_from_break", help="Continue from last source commit to target (based on svn2svn:* revprops).") parser.add_option("-f", "--force", action="store_true", dest="force_nocont", - help="Allow replaying into a non-empty target folder.") + help="Allow replaying into a non-empty target-repo folder.") parser.add_option("-r", "--revision", type="string", dest="revision", metavar="ARG", help="Revision range to replay from source_url.\n" "A revision argument can be one of:\n" -- 2.45.2