From 0f362a13bfafdd14393bdd370e9d196540365837 Mon Sep 17 00:00:00 2001
From: Andreas Gerstmayr <andreas@andreasgerstmayr.at>
Date: Sun, 18 Mar 2012 17:26:54 +0100
Subject: add begin/except for hg pull (mercurial 2.1 returns 1 for hg pull
 when no changes are found; this change gets reverted in mercurial 2.1.1)

---
 lib/puppet/provider/vcsrepo/hg.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/provider/vcsrepo/hg.rb b/lib/puppet/provider/vcsrepo/hg.rb
index 54205c2..0be5e08 100644
--- a/lib/puppet/provider/vcsrepo/hg.rb
+++ b/lib/puppet/provider/vcsrepo/hg.rb
@@ -65,7 +65,10 @@ Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) d
 
   def revision=(desired)
     at_path do
-      hg('pull')
+      begin
+        hg('pull')
+      rescue
+      end
       begin
         hg('merge')
       rescue Puppet::ExecutionFailure
-- 
cgit v1.2.3