зеркало из https://github.com/microsoft/git.git
contrib/git-svn: remove the --no-stop-on-copy flag
Output a big warning if somebody actually has a pre-1.0 version of svn that doesn't support it. Thanks to Yann Dirson for reminding me it still existed and attempting to re-enable it :) I think I subconciously removed support for it earlier... Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
1d52aba839
Коммит
7317ed906a
|
@ -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>,
|
||||
|
|
|
@ -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
|
||||
~~~~~~~~~~~~~~
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче