# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1373565183 25200
# Node ID aad5083f1117ba86ddb7401228502395ac6b7220
# Parent  bc17ab3c516e49f71cf6ee72a1e73f6f14a9352b
foo

diff -r bc17ab3c516e -r aad5083f1117 hq/main.py
--- a/hq/main.py	Mon Jun 24 11:28:58 2013 -0700
+++ b/hq/main.py	Thu Jul 11 10:53:03 2013 -0700
@@ -95,15 +95,14 @@
         # TODO: pull queue repo
         if self._versioned():
             if self.incoming():
-                print >> sys.stderr, "Incoming changes, cannot pull"
-                # TODO: yes you can if they're compatible
+                print >> sys.stderr, "Incoming changes"
+
+            output = self._status(self.directory())
+            if output:
+                print >> sys.stderr, "Cannot pull %s; outstanding changes" % (self.directory())
+                print output
             else:
-                output = self._status(self.directory())
-                if output:
-                    print >> sys.stderr, "Cannot pull %s; outstanding changes" % (self.directory())
-                    print output
-                else:
-                    self._call('pull', '--mq')
+                self._call('pull', '--mq')
         for patch in applied:
             self._call('qpush')