From 5ec514bd2f9b18463886df372ea1412fc61467de Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Thu, 9 Feb 2012 15:52:22 -0500 Subject: [PATCH] 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 Acked-by: Eric Wong --- git-svn.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}) { -- 2.26.2