Mercurial > hg > easyhg

diff mainwindow.cpp @ 282:1ec306df738e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 18 Feb 2011 13:39:16 +0000
parents 9162f14c5ab7 a98e76fa58f2
children a68801b31ceb
line wrap: on
line diff
--- a/mainwindow.cpp	Fri Feb 18 13:38:31 2011 +0000
+++ b/mainwindow.cpp	Fri Feb 18 13:39:16 2011 +0000
@@ -1695,7 +1695,7 @@
     case ACT_INCOMING:
         // returns non-zero code and no output if the check was
         // successful but there are no changes pending
-        if (output.trimmed() == "") {
+        if (output.replace(QRegExp("(^|\\n)warning: [^\\n]*\\n"), "").trimmed() == "") {
             showIncoming("");
             return;
         }