diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-25 12:57:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-25 12:57:48 -0700 |
| commit | 7756b1f1dc07fae9abab4126a687a2609dfbf009 (patch) | |
| tree | 03b62a5fb81bc0e974f2d37829505c683cdf20a6 /git-svn.perl | |
| parent | 1259404c7e5cd88b7f6692986469cd20cbfacdad (diff) | |
| parent | 70da769a4607dbbc4efc490287ead98175cf622b (diff) | |
| download | git-7756b1f1dc07fae9abab4126a687a2609dfbf009.tar.gz | |
Merge branch 'maint'
* maint:
xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
Update cherry documentation.
Refer to git-rev-parse:Specifying Revisions from git.txt
git-fetch.sh printed protocol fix
RPM package re-classification.
Documentation: note about contrib/.
git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
Set $HOME for selftests
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/git-svn.perl b/git-svn.perl index 54d2356933..37ecc51787 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); |