[RFC] naming of obsolescence troubles

Aurélien Campéas aurelien.campeas at logilab.fr
Thu Sep 27 10:42:07 CDT 2012

Le 27/09/2012 17:22, Pierre-Yves David a écrit :
> I'm about to submit patches to compute the two remaining troubles related to
> mutable history exchanges[1] (the first is "unstable" already in 2.3). But
> their name are not fully hammered yet.
> Please read the sentences below and discuss the *terms* used.
>      Exchange mutable history can bring different kind of *troubles*.

*troubled changesets*

>      First, ancestors of a changeset may becomes obsoletes. Such changeset are
>      called *unstable*.

When a changeset is obsoleted, its children are now *unstable*.

(they typically need to be rebased onto the freshest version of the
obsolete parent)

>      Second, a changeset may be a rewritten of a changeset now immutable. Such
>      changeset are called *latecomer*.

A changeset may obsolete a public changeset. Such a changeset is
called a *latecomer*.

(I'm perfectly fine with the term btw).

>      Third, multiple change may try to rewrite the same changeset. Such
>      changeset are called *divergent*.

Concurrent rewrites of a given changeset may happen. These changesets
are called *divergent*.

(I thought just *concurrent* was also fine and possibly more neutral
than *divergent*).

>      A changeset is called *troubled* when it is affected by at least one
>      *troubles* (*unstable*, *latecomer* or *divergent*)

(just nitpicking)

A *troubled* changeset is either *unstable*, *late* or *divergent*.


More information about the Mercurial-devel mailing list