]> git.openstreetmap.org Git - chef.git/commitdiff
Ignore ancestry when switching svn branches
authorTom Hughes <tom@compton.nu>
Fri, 6 Oct 2023 21:40:16 +0000 (22:40 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 6 Oct 2023 21:40:16 +0000 (22:40 +0100)
cookbooks/chef/libraries/subversion.rb

index a2a6e2ba9c91d2c8410a567aa99024a616b41df5..e8717d06e4ae86d419dd99fa7752f7b2e602e5bc 100644 (file)
@@ -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