[PATCH 3 of 5 V1 REBASED] obsolete: detect divergent changesets

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Dec 7 18:29:58 CST 2012


On Fri, Dec 07, 2012 at 03:14:48PM -0600, Augie Fackler wrote:
> 
> On Dec 7, 2012, at 11:25 AM, Kevin Bullock <kbullock+mercurial at ringworld.org> wrote:
> 
> > On Nov 30, 2012, at 3:12 PM, Pierre-Yves David wrote:
> > 
> >> # HG changeset patch
> >> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
> >> # Date 1352509811 -3600
> >> # Node ID 8044a49d9d33b9a568c6ee60041afa7fc39f7b3d
> >> # Parent  a174b9f3d76e9458e1bfbc590cb9d550dd478ad6
> >> obsolete: detect divergent changesets
> >> 
> >> Divergent changeset are final successors (non obsolete) of a changeset who
> >> compete with another set of final successors for this same changeset.
> >> 
> >> For example if you have two obsolescence markers A -> B and A -> C, B and C are
> >> both "divergent" because they compete to be the one true successors of A.
> >> 
> >> Public revision can't be divergent.
> > 
> > This description says nothing about the new revset you added below, which should be in a separate patch anyway.
> 
> Agreed.

This revset is necessary to test the detection. But I have less strong opinion
to keep it in the same patch.


More information about the Mercurial-devel mailing list