From: Joey Hess <joey@dodo.kitenet.net>
Date: Thu, 11 Oct 2007 06:13:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://kitenet.net/srv/git/kitenet.net/mr
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/05b4b156dfab3c89cbf4652183f997ce6d78739a?ds=inline;hp=-c

Merge branch 'master' of ssh://kitenet.net/srv/git/kitenet.net/mr
---

05b4b156dfab3c89cbf4652183f997ce6d78739a
diff --combined mr
index f769eff,6ace1d8..530f2e0
--- a/mr
+++ b/mr
@@@ -263,13 -263,7 +263,13 @@@ print "\nmr $action: finished (".join("
  	showstat($#failed+1, "failed", "failed"),
  	showstat($#skipped+1, "skipped", "skipped"),
  ).")\n";
 -exit @failed ? 1 : 0;
 +if (@failed) {
 +	exit 1;
 +}
 +elsif (! @successful && @skipped) {
 +	exit 1;
 +}
 +exit 0;
  
  my %loaded;
  sub loadconfig {
@@@ -356,9 -350,9 +356,9 @@@
  	}
  }
  
- __DATA__
- # Some useful actions that mr knows about by default.
+ # Finally, some useful actions that mr knows about by default.
  # These can be overridden in ~/.mrconfig.
+ __DATA__
  [default]
  update = \
  	if [ -d .svn ]; then \