diff -r 4345274adc4b -r 28d76afa1568 mercurial/wireproto.py --- a/mercurial/wireproto.py Mon Apr 21 16:02:03 2014 -0700 +++ b/mercurial/wireproto.py Mon Apr 21 18:59:09 2014 -0700 @@ -826,5 +826,5 @@ else: sys.stderr.write("abort: %s\n" % inst) return pushres(0) - except exchange.PushRaced, exc: + except error.PushRaced, exc: return pusherr(str(exc))