← Back to branch summary

~ubuntu-branches/debian/sid/git/sid

« back to all changes in this revision

Viewing changes to perl/Git/SVN/Fetcher.pm

  • Committer: Package Import Robot
  • Author(s): Jonathan Nieder
  • Date: 2013-10-21 11:46:45 UTC
  • mfrom: (1.2.25) (2.1.33 experimental)
  • Revision ID: package-import@ubuntu.com-20131021114645-i0sc6otbgg424r0w
Tags: 1:1.8.4.1-1
http://bugs.debian.org/725961
* merge branch debian-experimental.
* new upstream point release.
* debian/control: Build-Depends tcl instead of tcl8.5
  (closes: #725961).

Show diffs side-by-side

added added

removed removed

Lines of Context:
perl/Git/SVN/Fetcher.pm
315
315
sub apply_textdelta {
316
316
        my ($self, $fb, $exp) = @_;
317
317
        return undef if $self->is_path_ignored($fb->{path});
318
 
        my $fh = $::_repository->temp_acquire('svn_delta');
 
318
        my $suffix = 0;
 
319
        ++$suffix while $::_repository->temp_is_locked("svn_delta_${$}_$suffix");
 
320
        my $fh = $::_repository->temp_acquire("svn_delta_${$}_$suffix");
319
321
        # $fh gets auto-closed() by SVN::TxDelta::apply(),
320
322
        # (but $base does not,) so dup() it for reading in close_file
321
323
        open my $dup, '<&', $fh or croak $!;
322
 
        my $base = $::_repository->temp_acquire('git_blob');
 
324
        my $base = $::_repository->temp_acquire("git_blob_${$}_$suffix");
323
325
 
324
326
        if ($fb->{blob}) {
325
327
                my ($base_is_link, $size);