git-svn.perl: perform deletions before anything else

Steven Walter · Eric Wong · commit 5ec514bd2f9b · 2012-02-21T21:37:31.000Z
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 &lt;stevenrwalter@gmail.com&gt;
Acked-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git 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}) {
