X-Git-Url: https://leap.se/git/puppet_vcsrepo.git/blobdiff_plain/28f8646e4669bacf7a87ffc8694715333355cd32..7aab800dff04c485308edd906ce234e83ffb154e:/lib/puppet/type/vcsrepo.rb diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb index fdcf9ab..e5dfbb5 100644 --- a/lib/puppet/type/vcsrepo.rb +++ b/lib/puppet/type/vcsrepo.rb @@ -49,6 +49,9 @@ Puppet::Type.newtype(:vcsrepo) do feature :submodules, "The repository contains submodules which can be optionally initialized" + feature :conflict, + "The provider supports automatic conflict resolution" + ensurable do attr_accessor :latest @@ -221,6 +224,10 @@ Puppet::Type.newtype(:vcsrepo) do defaultto true end + newparam :conflict do + desc "The action to take if conflicts exist between repository and working copy" + end + autorequire(:package) do ['git', 'git-core'] end