[PATCH] wireproto: clarify cryptic 'unsynced changes' error message

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu Apr 11 17:59:26 CDT 2013

On 11 avr. 2013, at 22:35, Mads Kiilerich wrote:

> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1365684858 -7200
> #      Thu Apr 11 14:54:18 2013 +0200
> # Node ID e34e55c1738d828cd8406b234beae3ab8469ec16
> # Parent  33c8339a9bcc40714df865a5bdc4cf9b1e669c48
> wireproto: clarify cryptic 'unsynced changes' error message
> The message was not very much to the point and did not in any way help an
> ordinary user.
> 'repository changed while preparing/uploading bundle - please try again'
> is more correct, gives the user some understanding of what is going on, and
> tells how to 'recover' from the situation.
> The 'bundle' aspect could be seen as an implementation detail that shouldn't be
> mentioned, but I think it helps giving an exact error message.

Meh, bundle is very cryptic. Maybe changeset's bundle.

"repository changed while uploading changesets bundle - please try again" ?

(but see below anyway)

> The message could still leave the user wondering why Mercurial doesn't lock the
> repo and how unsafe it thus is. Explaining that is however too much detail.

The current message does not make it clear that the *remote* repository is the one who changed. What about:

	new changes on remote repository while uploading data - please try again

Pierre-Yves David

More information about the Mercurial-devel mailing list