mercurial/bundle2.py

--- a/mercurial/bundle2.py	Mon Apr 21 16:02:03 2014 -0700
+++ b/mercurial/bundle2.py	Mon Apr 21 18:59:09 2014 -0700
@@ -145,7 +145,7 @@
 import urllib
 import string
 
-import changegroup
+import changegroup, error
 from i18n import _
 
 _pack = struct.pack
@@ -730,7 +730,7 @@
         h = inpart.read(20)
     assert not h
     if heads != op.repo.heads():
-        raise exchange.PushRaced()
+        raise error.PushRaced()
 
 @parthandler('b2x:output')
 def handleoutput(op, inpart):