From 2fef1fd91efd174334633ebd2f53b9d46b3e5942 Mon Sep 17 00:00:00 2001 From: Tony Duckles Date: Sat, 22 Sep 2012 22:19:40 -0500 Subject: [PATCH] Misc documentation tweaks * svn2svn/run/svnreplay.py (main): Include mention of arguments passed to the before-commit script. * svn2svn/run/svnreplay.py (do_svn_add): Re-word comment for clarity. --- svn2svn/run/svnreplay.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/svn2svn/run/svnreplay.py b/svn2svn/run/svnreplay.py index 37383dd..71194cd 100644 --- a/svn2svn/run/svnreplay.py +++ b/svn2svn/run/svnreplay.py @@ -466,10 +466,10 @@ def do_svn_add(source_url, path_offset, source_rev, source_ancestors, \ 4. svn mv /branches/fix1/Proj2/file1.txt /branches/fix1/Proj2/file2.txt " Rename file inside renamed folder 5. svn co /trunk && svn merge /branches/fix1 After the merge and commit, "svn log -v" with show a delete of /trunk/Proj1 - and and add of /trunk/Proj2 copy-from /branches/fix1/Proj2. If we were just - to do a straight "svn export+add" based on the /branches/fix1/Proj2 folder, - we'd lose the logical history that Proj2/file2.txt is really a descendant - of Proj1/file1.txt. + and and add of /trunk/Proj2 copy-from /branches/fix1/Proj2. If we just did + a straight "svn export+add" based on the /branches/fix1/Proj2 folder, we'd + lose the logical history that Proj2/file2.txt is really a descendant of + Proj1/file1.txt. 'path_offset' is the offset from source_base to the file to check ancestry for, e.g. 'projectA/file1.txt'. path = source_repos_url + source_base + path_offset. @@ -1071,7 +1071,8 @@ Examples: help="Verify ancestry and content for entire target_url tree after every target commit or last target commit.") parser.add_option("--pre-commit", type="string", dest="beforecommit", metavar="CMD", help="Run the given shell script before each replayed commit, e.g. " - "to modify file-content during replay.") + "to modify file-content during replay.\n" + "Called as: CMD [wc_path] [source_rev]") parser.add_option("--debug", dest="verbosity", const=ui.DEBUG, action="store_const", help="Enable debugging output (same as -vvv).") global options -- 2.43.0