# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1315886565 18000
# Node ID bfe903b1ff4eaa081ff4374b6d3744a0936b928e
# Parent  adad8d68fb1f0cdebb1b6acd717b13dd500a3935# Parent  31c9e2a702d128c5d0e2aa35eaa8cf5434029910
merge with stable

diff -r adad8d68fb1f -r bfe903b1ff4e mercurial/patch.py
--- a/mercurial/patch.py	Sun Sep 11 18:49:54 2011 +0200
+++ b/mercurial/patch.py	Mon Sep 12 23:02:45 2011 -0500
@@ -1199,7 +1199,7 @@
             m = gitre.match(x)
             if not m:
                 continue
-            if gitpatches is None:
+            if not gitpatches:
                 # scan whole input for git metadata
                 gitpatches = [('a/' + gp.path, 'b/' + gp.path, gp) for gp
                               in scangitpatch(lr, x)]
diff -r adad8d68fb1f -r bfe903b1ff4e mercurial/ui.py
--- a/mercurial/ui.py	Sun Sep 11 18:49:54 2011 +0200
+++ b/mercurial/ui.py	Mon Sep 12 23:02:45 2011 -0500
@@ -667,9 +667,9 @@
         printed.'''
         if self.tracebackflag:
             if exc:
-                traceback.print_exception(exc[0], exc[1], exc[2])
+                traceback.print_exception(exc[0], exc[1], exc[2], file=self.ferr)
             else:
-                traceback.print_exc()
+                traceback.print_exc(file=self.ferr)
         return self.tracebackflag
 
     def geteditor(self):
diff -r adad8d68fb1f -r bfe903b1ff4e tests/test-setdiscovery.t
--- a/tests/test-setdiscovery.t	Sun Sep 11 18:49:54 2011 +0200
+++ b/tests/test-setdiscovery.t	Mon Sep 12 23:02:45 2011 -0500
@@ -288,7 +288,7 @@
   reading DAG from stdin
 
   $ hg heads -t --template . | wc -c
-  261
+   *261 (re)
 
   $ hg clone -b a . a
   adding changesets