From: Steven Walter <swalter@lexmark.com>
Date: Thu, 9 Feb 2012 20:52:22 +0000 (-0500)
Subject: git-svn.perl: perform deletions before anything else
X-Git-Tag: v1.7.10-rc0~62^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5ec514bd2f9b18463886df372ea1412fc61467de;p=git.git

git-svn.perl: perform deletions before anything else

If we delete a file and recreate it as a directory in a single commit,
we have to tell the server about the deletion first or else we'll get
"RA layer request failed: Server sent unexpected return value (405
Method Not Allowed) in response to MKCOL request"

Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 7a92764c6..028f11803 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -5381,7 +5381,7 @@ sub DESTROY {
 sub apply_diff {
 	my ($self) = @_;
 	my $mods = $self->{mods};
-	my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
+	my %o = ( D => 0, C => 1, R => 2, A => 3, M => 4, T => 5 );
 	foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
 		my $f = $m->{chg};
 		if (defined $o{$f}) {