summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorSteven Walter <swalter@lexmark.com>2012-02-09 15:52:22 -0500
committerEric Wong <normalperson@yhbt.net>2012-02-21 21:37:31 +0000
commit5ec514bd2f9b18463886df372ea1412fc61467de (patch)
tree6ae5e18c8078eaf7e760707534848e999ada2eb8 /git-svn.perl
parent6aa17fc69bce19bcd412cf4b950e797767c87012 (diff)
downloadgit-5ec514bd2f9b18463886df372ea1412fc61467de.tar.gz
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>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 7a92764c65..028f118037 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}) {