undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kh/svn'

Browse Source 
* kh/svn:
  git-svnimport: Don't assume that copied files haven't changed
This commit is contained in:
Junio C Hamano 2006-04-07 18:01:55 -07:00
commit a906ce6aa7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git-svnimport.perl
View File

@ -616,9 +616,7 @@ sub commit {
} }
if(($action->[0] eq "A") || ($action->[0] eq "R")) { if(($action->[0] eq "A") || ($action->[0] eq "R")) {
my $node_kind = node_kind($branch,$path,$revision); my $node_kind = node_kind($branch,$path,$revision);
if($action->[1]) { if ($node_kind eq $SVN::Node::file) {
copy_path($revision,$branch,$path,$action->[1],$action->[2],$node_kind,\@new,\@parents);
} elsif ($node_kind eq $SVN::Node::file) {
my $f = get_file($revision,$branch,$path); my $f = get_file($revision,$branch,$path);
if ($f) { if ($f) {
push(@new,$f) if $f; push(@new,$f) if $f;
@ -627,8 +625,15 @@ sub commit {
print STDERR "$revision: $branch: could not fetch '$opath'\n"; print STDERR "$revision: $branch: could not fetch '$opath'\n";
} }
} elsif ($node_kind eq $SVN::Node::dir) { } elsif ($node_kind eq $SVN::Node::dir) {
get_ignore(\@new, \@old, $revision, if($action->[1]) {
$branch,$path); copy_path($revision, $branch,
$path, $action->[1],
$action->[2], $node_kind,
\@new, \@parents);
} else {
get_ignore(\@new, \@old, $revision,
$branch, $path);
}
} }
} elsif ($action->[0] eq "D") { } elsif ($action->[0] eq "D") {
push(@old,$path); push(@old,$path);