summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6aa17fc)
raw | patch | inline | side by side (parent: 6aa17fc)
author | Steven Walter <swalter@lexmark.com> | |
Thu, 9 Feb 2012 20:52:22 +0000 (15:52 -0500) | ||
committer | Eric Wong <normalperson@yhbt.net> | |
Tue, 21 Feb 2012 21:37:31 +0000 (21:37 +0000) |
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>
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>
git-svn.perl | patch | blob | history |
diff --git a/git-svn.perl b/git-svn.perl
index 7a92764c657aff80bf03fbc67e021f9892a32b31..028f1180374020c1eb6e30fd95b430e9324dc03c 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
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}) {