--- a/mercurial/localrepo.py	Mon Apr 21 16:02:03 2014 -0700
+++ b/mercurial/localrepo.py	Mon Apr 21 18:59:09 2014 -0700
@@ -133,7 +133,7 @@
                 stream = util.chunkbuffer(ret.getchunks())
                 ret = bundle2.unbundle20(self.ui, stream)
             return ret
-        except exchange.PushRaced, exc:
+        except error.PushRaced, exc:
             raise error.ResponseError(_('push failed:'), exc.message)
 
     def lock(self):