[svk-commit] r2297 - branches/2.0-releng/lib/SVK/Mirror/Backend

[nobody at bestpractical.com]

Author: clkao
Date: Fri Feb  9 11:42:17 2007
New Revision: 2297

Modified:
   branches/2.0-releng/lib/SVK/Mirror/Backend/SVNRa.pm

Log:
Merge from trunk:

 r2293 at trunk:  audreyt | 2007-01-25 22:40:58 +0800
 * SVK::Mirror::Backend::SVNRa - Probe for replaying from googlecode  
   could fail with RA_DAV_REQUEST_FAILED instead of UNSUPPORTED_FEATURE,
   which used to caused a crash on every sync.
 
 * Also squash a uninitialized warning in SVNRa.pm.


Modified: branches/2.0-releng/lib/SVK/Mirror/Backend/SVNRa.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Mirror/Backend/SVNRa.pm	(original)
+++ branches/2.0-releng/lib/SVK/Mirror/Backend/SVNRa.pm	Fri Feb  9 11:42:17 2007
@@ -306,7 +306,8 @@
     # FIXME: if we do ^c here $err would be empty. do something else.
     return $self->_has_replay(0)
       if $err->apr_err == $SVN::Error::RA_NOT_IMPLEMENTED      # ra_svn
-      || $err->apr_err == $SVN::Error::UNSUPPORTED_FEATURE;    # ra_dav
+      || $err->apr_err == $SVN::Error::UNSUPPORTED_FEATURE     # ra_dav
+      || $err->apr_err == $SVN::Error::RA_DAV_REQUEST_FAILED;  # ra_dav (googlecode)
     die $err->expanded_message;
 }
 
@@ -374,6 +375,9 @@
 sub find_rev_from_changeset {
     my ($self, $changeset) = @_;
     my $t = $self->mirror->get_svkpath;
+
+    no warnings 'uninitialized'; # $s_changeset below may be undef
+
     return $t->search_revision
 	( cmp => sub {
 	      my $rev = shift;