diff options
author | TP Honey <tphoney@users.noreply.github.com> | 2015-03-30 10:36:42 +0100 |
---|---|---|
committer | TP Honey <tphoney@users.noreply.github.com> | 2015-03-30 10:36:42 +0100 |
commit | 3d4547646d49295c91bb002fa885e187c2d89feb (patch) | |
tree | 922b733d6dcd048e6069bc4bbf05a64606fd8c14 /lib/puppet/type | |
parent | 74e415866ef2d39ed1568dd43b6e8596590dedaf (diff) | |
parent | 7fdfa1b4047e134053f6df95f414cb3fc44796cd (diff) | |
download | puppet-vcsrepo-3d4547646d49295c91bb002fa885e187c2d89feb.tar.gz puppet-vcsrepo-3d4547646d49295c91bb002fa885e187c2d89feb.tar.bz2 |
Merge pull request #220 from ddisisto/1.2.x_add_svn_accept
Add support for 'conflict' parameter to populate svn --accept arg
Diffstat (limited to 'lib/puppet/type')
-rw-r--r-- | lib/puppet/type/vcsrepo.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb index 3bf4029..52eace8 100644 --- a/lib/puppet/type/vcsrepo.rb +++ b/lib/puppet/type/vcsrepo.rb @@ -46,6 +46,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 @@ -214,6 +217,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 |