X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-svn.perl;h=37ecc517879aa2c18cc909c60d3bf6ceed82fb48;hb=67e78c3b8aeb44681b2d4ab2cf97145b7cc9a7a2;hp=54d23569337f680f7936390c8a83d2e7f2868c38;hpb=f73a5e897609c895aa6c10f7a89428d1749d37ce;p=git.git

diff --git a/git-svn.perl b/git-svn.perl
index 54d235693..37ecc5178 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -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);