diff options
author | Daniel DiSisto <ddisisto@gmail.com> | 2015-03-06 17:01:38 +1100 |
---|---|---|
committer | Daniel DiSisto <ddisisto@gmail.com> | 2015-03-06 17:01:38 +1100 |
commit | 7fdfa1b4047e134053f6df95f414cb3fc44796cd (patch) | |
tree | 71b70ebadb1e2754a7aea7f45dc8061e42cb34c9 /lib/puppet/type/vcsrepo.rb | |
parent | 9a955b8746f373a1a3e47ebf67d4186b98e0094f (diff) | |
download | puppet-vcsrepo-7fdfa1b4047e134053f6df95f414cb3fc44796cd.tar.gz puppet-vcsrepo-7fdfa1b4047e134053f6df95f414cb3fc44796cd.tar.bz2 |
(MODULES-1551) Add support for SVN conflict handling
Diffstat (limited to 'lib/puppet/type/vcsrepo.rb')
-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 |