diff options
| -rwxr-xr-x | contrib/git-svn/git-svn.perl | 11 | ||||
| -rw-r--r-- | contrib/git-svn/git-svn.txt | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl index dca4e5c41..43b50ecfb 100755 --- a/contrib/git-svn/git-svn.perl +++ b/contrib/git-svn/git-svn.perl @@ -1019,6 +1019,17 @@ sub svn_compat_check { if (grep /usage: checkout URL\[\@REV\]/,@co_help) { $_svn_co_url_revs = 1; } + + # I really, really hope nobody hits this... + unless (grep /stop-on-copy/, (safe_qx(qw(svn log -h)))) { + print STDERR <<''; +W: The installed svn version does not support the --stop-on-copy flag in + the log command. + Lets hope the directory you're tracking is not a branch or tag + and was never moved within the repository... + + $_no_stop_copy = 1; + } } # *sigh*, new versions of svn won't honor -r<rev> without URL@<rev>, diff --git a/contrib/git-svn/git-svn.txt b/contrib/git-svn/git-svn.txt index 5fb5b7c88..7a6e0c4a4 100644 --- a/contrib/git-svn/git-svn.txt +++ b/contrib/git-svn/git-svn.txt @@ -162,19 +162,6 @@ COMPATIBILITY OPTIONS Otherwise, do not enable this flag unless you know what you're doing. ---no-stop-on-copy:: - Only used with the 'fetch' command. - - By default, git-svn passes --stop-on-copy to avoid dealing with - the copied/renamed branch directory problem entirely. A - copied/renamed branch is the result of a <SVN_URL> being created - in the past from a different source. These are problematic to - deal with even when working purely with svn if you work inside - subdirectories. - - Do not use this flag unless you know exactly what you're getting - yourself into. You have been warned. - Basic Examples ~~~~~~~~~~~~~~ |