Ignore nonzero exit status of hg pull, which can happen when there were no changes...

diff --git a/debian/changelog b/debian/changelog
index 73410b5244fc2920d55e44728f05020fc2c2c905..779920a04b449e4942f242c63a4204a17c485f07 100644 (file)
--- 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.
 mr (1.11) unstable; urgency=low
 
   * Now supports the veracity vcs. Thanks, Jimmy Tang.

diff --git a/mr b/mr
index 8408c61d5407d56301f081e000b01bf02d0a547f..cb4ff43b23d97adcb8daf138797adaf9722e37d4 100755 (executable)
--- a/mr
+++ b/mr
@@ -1891,7 +1891,7 @@ bzr_update =
                bzr merge --pull "$@"
        fi
 cvs_update = cvs 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 "$@"
 darcs_update = darcs pull -a "$@"
 fossil_update = fossil pull "$@"
 vcsh_update = vcsh run "$MR_REPO" git pull "$@"