From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 Oct 2023 21:40:16 +0000 (+0100)
Subject: Ignore ancestry when switching svn branches
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/9391e90cce455a491803d9edb68ed01a0132dc84

Ignore ancestry when switching svn branches
---

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index a2a6e2ba9..e8717d06e 100644
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -16,7 +16,7 @@ class Chef
           c = scm :update, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", new_resource.destination
           Chef::Log.debug "#{new_resource} updated working copy #{new_resource.destination} to revision #{new_resource.revision}"
         else
-          c = scm :switch, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", new_resource.repository, new_resource.destination
+          c = scm :switch, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", "--ignore-ancestry", new_resource.repository, new_resource.destination
           Chef::Log.debug "#{new_resource} updated working copy #{new_resource.destination} to #{new_resource.repository} revision #{new_resource.revision}"
         end
         c