Mercurial > public > mercurial-scm > hg

diff mercurial/bundle2.py @ 21185:5b3717e1a3ea stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: add an error message to push race error Errors with no explanations makes my uncle Bob sad.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 21 Apr 2014 20:04:54 -0700
parents 28d76afa1568
children 9f3652e851f8
line wrap: on
line diff
--- a/mercurial/bundle2.py	Mon Apr 21 18:59:09 2014 -0700
+++ b/mercurial/bundle2.py	Mon Apr 21 20:04:54 2014 -0700
@@ -730,7 +730,8 @@
         h = inpart.read(20)
     assert not h
     if heads != op.repo.heads():
-        raise error.PushRaced()
+        raise error.PushRaced('repository changed while pushing - '
+                              'please try again')
 
 @parthandler('b2x:output')
 def handleoutput(op, inpart):