[PATCH 1/2] git-svn.perl: perform deletions before anything else
- From
Steven Walter <stevenrwalter@gmail.com>
- Date
- Feb 9, 2012, 20:52 UTC
- Message-ID
- <1328820742-4795-2-git-send-email-stevenrwalter@gmail.com>
- In-Reply-To
- <1328820742-4795-1-git-send-email-stevenrwalter@gmail.com>
From: Steven Walter <swalter@lexmark.com>
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> --- git-svn.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl index eeb83d3..06c9322 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -5374,7 +5374,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}) {
-- 1.7.5.4