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>
Eric Wong committed
Mar 9, 2006 at 03:50 UTC
7317ed906a17c91593f38831412379d4429528db
2 files changed
+11
-13
contrib/git-svn/git-svn.perl
+11
@@ -1019,6 +1019,17 @@ sub svn_compat_check {
1019
if (grep /usage: checkout URL\[\@REV\]/,@co_help) {
1020
$_svn_co_url_revs = 1;
1021
}
1022
+
1023
+ # I really, really hope nobody hits this...
1024
+ unless (grep /stop-on-copy/, (safe_qx(qw(svn log -h)))) {
1025
+ print STDERR <<'';
1026
+W: The installed svn version does not support the --stop-on-copy flag in
1027
+ the log command.
1028
+ Lets hope the directory you're tracking is not a branch or tag
1029
+ and was never moved within the repository...
1030
+
1031
+ $_no_stop_copy = 1;
1032
+ }
1033
}
1034
1035
# *sigh*, new versions of svn won't honor -r<rev> without URL@<rev>,
contrib/git-svn/git-svn.txt
-13
@@ -162,19 +162,6 @@ COMPATIBILITY OPTIONS
162
Otherwise, do not enable this flag unless you know what you're
163
doing.
164
165
---no-stop-on-copy::
166
- Only used with the 'fetch' command.
167
-
168
- By default, git-svn passes --stop-on-copy to avoid dealing with
169
- the copied/renamed branch directory problem entirely. A
170
- copied/renamed branch is the result of a <SVN_URL> being created
171
- in the past from a different source. These are problematic to
172
- deal with even when working purely with svn if you work inside
173
- subdirectories.
174
-
175
- Do not use this flag unless you know exactly what you're getting
176
- yourself into. You have been warned.
177
-
165
Basic Examples
166
~~~~~~~~~~~~~~
167