From: Joey Hess <joey@kitenet.net>
Date: Fri, 2 Mar 2012 04:33:51 +0000 (-0400)
Subject: Ignore nonzero exit status of hg pull, which can happen when there were no changes... 
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/6deeaafd7de4aae2e2ee0d2e765e6afd2e84346b?hp=44d41d90e345aae6a72288ba381faa539032c783

Ignore nonzero exit status of hg pull, which can happen when there were no changes to pull. Closes: #661870
---

diff --git a/debian/changelog b/debian/changelog
index 73410b5..779920a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (1.12) UNRELEASED; urgency=low
+
+  * Ignore nonzero exit status of hg pull, which can happen
+    when there were no changes to pull. Closes: #661870 
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 02 Mar 2012 00:33:08 -0400
+
 mr (1.11) unstable; urgency=low
 
   * Now supports the veracity vcs. Thanks, Jimmy Tang.
diff --git a/mr b/mr
index 8408c61..cb4ff43 100755
--- a/mr
+++ b/mr
@@ -1891,7 +1891,7 @@ bzr_update =
 		bzr merge --pull "$@"
 	fi
 cvs_update = cvs update "$@"
-hg_update  = hg pull "$@" && hg update "$@"
+hg_update  = hg pull "$@"; hg update "$@"
 darcs_update = darcs pull -a "$@"
 fossil_update = fossil pull "$@"
 vcsh_update = vcsh run "$MR_REPO" git pull "$@"