[PATCH STABLE] help: add an help topic about the Changesets obsolescence concept

Mads Kiilerich mads at kiilerich.com
Wed Aug 1 08:38:31 CDT 2012


On 01/08/12 13:57, pierre-yves.david at logilab.fr wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
> # Date 1343822129 -7200
> # Branch stable
> # Node ID c722b2f123ecb3b30d8454c5b0b61305f3dc4776
> # Parent  7d2967de2c04489f9ce64308eb39d8a55d66af7c
> help: add an help topic about the Changesets obsolescence concept
>
> Thanks to Dirkjan Ochtman for his help.
>
> diff --git a/mercurial/help.py b/mercurial/help.py
> --- a/mercurial/help.py
> +++ b/mercurial/help.py
> @@ -159,10 +159,11 @@ helptable = sorted([
>      (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),
>      (["glossary"], _("Glossary"), loaddoc('glossary')),
>      (["hgignore", "ignore"], _("Syntax for Mercurial Ignore Files"),
>       loaddoc('hgignore')),
>      (["phases"], _("Working with Phases"), loaddoc('phases')),
> +   (["obsolescence"], _("Safely rework and exchange mutable history"), loaddoc('obsolescence')),

The description indicates a broader scope than just obsolescence. Or the 
other way around: Obsolescence might be all we have now, but I guess it 
will evolve to the full 'mutable' concept. Why not call the help topic 
'mutable' from the beginning.

The core concepts should also be defined / explained in 
mercurial/help/glossary.txt .

> --- /dev/null
> +++ b/mercurial/help/obsolescence.txt
> @@ -0,0 +1,66 @@
> +Changesets obsolescence
> +
> +    Obsolescence markers make it possible to mark changesets that have been
> +    deleted or supersed in a new version of the changeset.

We would end up with a funny text if I started proof reading, but I do 
know how to spot the red lines from a spell checker ;-)

superseded

> +    We do not recommed using this feature with this version of Mercurial. For

recommend

/Mads


More information about the Mercurial-devel mailing list