]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / myrepos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44d41d9)
Ignore nonzero exit status of hg pull, which can happen when there were no changes...
authorJoey Hess <joey@kitenet.net>
Fri, 2 Mar 2012 04:33:51 +0000 (00:33 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 2 Mar 2012 04:33:51 +0000 (00:33 -0400)
debian/changelog patch | blob | history
mr patch | blob | history

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.
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 "$@"
-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 "$@"
hacking on myrepos

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.