Patch for git-svn.perl

Patch for git-svn.perl

[Paul Talacko]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

Hello,

There's an issue in git-svn as autoprops are not applied to renamed files, only to added files.

This patch fixes the bug.




      

[-- Attachment #2: patch --]
[-- Type: application/octet-stream, Size: 438 bytes --]

diff --git a/git-svn.perl b/git-svn.perl
index 7a1d26d..0a04cc0 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3636,6 +3636,7 @@ sub R {
 	my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
 				$self->url_path($m->{file_a}), $self->{r});
 	print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
+	$self->apply_autoprops( $file, $fbat );
 	$self->chg_file($fbat, $m);
 	$self->close_file($fbat,undef,$self->{pool});
 

Re: Patch for git-svn.perl

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

On Fri, Sep 05, 2008 at 11:18:26AM +0000, Paul Talacko <gnuruandstuff@yahoo.co.uk> wrote:
> There's an issue in git-svn as autoprops are not applied to renamed files, only to added files.
> 
> This patch fixes the bug.

Please read Documentation/SubmittingPatches and send a proper patch,
thanks!

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: Patch for git-svn.perl

[Eric Wong]

Paul Talacko <gnuruandstuff@yahoo.co.uk> wrote:
> Hello,
> 
> There's an issue in git-svn as autoprops are not applied to renamed
> files, only to added files.
> 
> This patch fixes the bug.

Thanks Paul.  I've also added a test case as well.

Junio,

I've rebased against 80d12c2 and repushed out to
git://git.bogomips.org/git-svn.git along with the following changes:

Eric Wong (2):
      git-svn: check error code of send_txstream
      t9124: clean up chdir usage

Florian Weimer (3):
      git-svn: extract base blob in generate_diff
      git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob
      git-svn: Send deltas during commits

Paul Talacko (1):
      git-svn: set auto_props when renaming files

Thomas Rast (9):
      git svn: catch lack of upstream info for dcommit earlier
      git svn info: tests: let 'init' test run with SVN 1.5
      git svn info: tests: do not use set -e
      git svn info: tests: use test_cmp instead of git-diff
      git svn info: tests: fix ptouch argument order in setup
      git svn info: make info relative to the current directory
      git svn info: always quote URLs in 'info' output
      git-svn: match SVN 1.5 behaviour of info' on unknown item
      git-svn: fix 'info' tests for unknown items

-- 
Eric Wong

Re: Patch for git-svn.perl

[Junio C Hamano]

Eric Wong <normalperson@yhbt.net> writes:

> Junio,
>
> I've rebased against 80d12c2 and repushed out to
> git://git.bogomips.org/git-svn.git along with the following changes:

Thanks.  I'll be pulling from you, Paul and Shawn for subsystem updates
this weekend.