mercurial/wireproto.py
changeset 18957 6b618aa08b6e
parent 18382 f3b21beb9802
child 19176 aae14b3d0a9c
--- a/mercurial/wireproto.py	Mon Feb 11 00:43:12 2013 +0100
+++ b/mercurial/wireproto.py	Thu Apr 11 14:54:18 2013 +0200
@@ -602,7 +602,8 @@
 
     # fail early if possible
     if not check_heads():
-        return pusherr('unsynced changes')
+        return pusherr('repository changed while preparing changes - '
+                       'please try again')
 
     # write bundle data to temporary file because it can be big
     fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
@@ -615,7 +616,8 @@
             if not check_heads():
                 # someone else committed/pushed/unbundled while we
                 # were transferring data
-                return pusherr('unsynced changes')
+                return pusherr('repository changed while uploading changes - '
+                               'please try again')
 
             # push can proceed
             fp.seek(0)