Skip to content

Commit

Permalink
contrib/git-svn: remove the --no-stop-on-copy flag
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Mar 9, 2006
1 parent 1d52aba commit 7317ed9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
11 changes: 11 additions & 0 deletions contrib/git-svn/git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
13 changes: 0 additions & 13 deletions contrib/git-svn/git-svn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~

Expand Down

0 comments on commit 7317ed9

Please sign in to comment.