Merge pull request #18 from notalex/OTWO-3222

OTWO-3222: Fix svn checkout failures during svn-git conversion

Author: Peter Degen-Portnoy

lib/scm/adapters/git/pull.rb

@@ -93,6 +93,13 @@ def convert(source_scm)
 						r.scm.checkout(r, url)
 					end
 
+          # Sometimes svn conflicts occur leading to a silent `svn checkout` failure.
+          if source_scm.is_a?(SvnAdapter) && SvnAdapter.has_conflicts?(url)
+            logger.info { "Working copy has svn conflicts. Cleaning and trying again..." }
+            clean_up_disk
+            r.scm.checkout(r, url)
+          end
+
 					logger.debug { "Committing revision #{r.token} (#{i+1} of #{commits.size})... " }
 					commit_all(r)
 				end

lib/scm/adapters/svn/misc.rb

@@ -132,5 +132,11 @@ def opt_auth
 			opt_password = "--username='#{self.username}' --password='#{self.password}'" if self.username && self.username != ''
 			" #{opt_password} --no-auth-cache "
 		end
+
+    class << self
+      def has_conflicts?(working_copy_url)
+        system("cd '#{ working_copy_url }' && svn status | grep 'Summary of conflicts'")
+      end
+    end
 	end
 end