Skip to content

Commit

Permalink
git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
Browse files Browse the repository at this point in the history
I incorrectly thought this was hopelessly broken in svn 1.4.0,
but now it's just broken in that the old method didn't work.  It
looks like svn propdel and svn propset must be used now and the
(imho) more obvious svn rm --force && svn add no longer works.

"make -C t full-svn-test" should now work.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Oct 24, 2006
1 parent 2eb10ac commit 9ffd652
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -1501,10 +1501,13 @@ sub svn_checkout_tree {
apply_mod_line_blob($m);
svn_check_prop_executable($m);
} elsif ($m->{chg} eq 'T') {
sys(qw(svn rm --force),$m->{file_b});
apply_mod_line_blob($m);
sys(qw(svn add), $m->{file_b});
svn_check_prop_executable($m);
apply_mod_line_blob($m);
if ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
sys(qw(svn propdel svn:special), $m->{file_b});
} else {
sys(qw(svn propset svn:special *),$m->{file_b});
}
} elsif ($m->{chg} eq 'A') {
svn_ensure_parent_path( $m->{file_b} );
apply_mod_line_blob($m);
Expand Down

0 comments on commit 9ffd652

Please sign in to comment.