[PATCH 7 of 7 V3] push: refuse to push bumped changeset

Kevin Bullock kbullock+mercurial at ringworld.org
Tue Oct 16 17:07:55 CDT 2012


On Oct 16, 2012, at 3:48 PM, Pierre-Yves David wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
> # Date 1350420189 -7200
> # Node ID 2a0450f1ede03ee9d0bf381eac20a0a20d899c0c
> # Parent  a3e43e8c10a5970438004bcff6c638d5df622780
> push: refuse to push bumped changeset
> 
> This applies the same logic as used for `obsolete` and `unstable` changesets.
> Refuse to push them without force.
> 
> We'll probably want to factor this logic with two new functions `pctx.troubled()`
> and  `ctx.troubles()`. But I'm waiting for the third "trouble" to make it into
> core.
> 
> diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
> --- a/mercurial/localrepo.py
> +++ b/mercurial/localrepo.py
> @@ -1880,6 +1880,7 @@
>                             # this message are here for 80 char limit reason
>                             mso = _("push includes an obsolete changeset: %s!")
>                             msu = _("push includes an unstable changeset: %s!")
> +                            msb = _("push includes an bumped changeset: %s!")
                                                      a bumped
[an is only used when the following word begins with a vowel]

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list