git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
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>
Eric Wong committed
Oct 24, 2006 at 02:50 UTC
9ffd652a385298f3565fdc3f0d0424001a376539
1 file changed
+6
-3
git-svn.perl
+6
-3
@@ -1501,10 +1501,13 @@ sub svn_checkout_tree {
1501
apply_mod_line_blob($m);
1502
svn_check_prop_executable($m);
1503
} elsif ($m->{chg} eq 'T') {
1504
- sys(qw(svn rm --force),$m->{file_b});
1505
- apply_mod_line_blob($m);
1506
- sys(qw(svn add), $m->{file_b});
1504
svn_check_prop_executable($m);
1505
+ apply_mod_line_blob($m);
1506
+ if ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
1507
+ sys(qw(svn propdel svn:special), $m->{file_b});
1508
+ } else {
1509
+ sys(qw(svn propset svn:special *),$m->{file_b});
1510
+ }
1511
} elsif ($m->{chg} eq 'A') {
1512
svn_ensure_parent_path( $m->{file_b} );
1513
apply_mod_line_blob($m);