Skip to content

Commit

Permalink
git-svn: correctly track diff-less copies with do_switch
Browse files Browse the repository at this point in the history
Also, this should allow for the tracking of new, but empty
directories where we would want to see the log message.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
  • Loading branch information
Eric Wong committed Feb 23, 2007
1 parent 0af9c9f commit 2fa6a23
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,7 @@ sub find_parent_branch {
1, $ed)
or die "SVN connection failed somewhere...\n";
}
$ed->{new_fetch} = 1;
return $self->make_log_entry($rev, [$parent], $ed);
}
not_found:
Expand Down Expand Up @@ -1202,6 +1203,7 @@ sub do_fetch {
return $log_entry;
}
$ed = SVN::Git::Fetcher->new($self);
$ed->{new_fetch} = 1;
}
unless ($self->ra->gs_do_update($last_rev, $rev,
$self->{path}, 1, $ed)) {
Expand Down Expand Up @@ -1275,7 +1277,7 @@ sub make_log_entry {
my ($self, $rev, $parents, $ed) = @_;
my $untracked = $self->get_untracked($ed);

return undef if ($ed->{nr} == 0 && scalar @$untracked == 0);
return undef if (! $ed->{new_fetch} && ! $ed->{nr} && ! @$untracked);

open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
print $un "r$rev\n" or croak $!;
Expand Down

0 comments on commit 2fa6a23

Please sign in to comment.