(1) How to detect criss-cross (2) is ancestor(*changeset) always the "base" of merges

Kevin Bullock kbullock+mercurial at ringworld.org
Tue Jan 7 04:15:19 UTC 2014


On 30 Dec 2013, at 7:53 PM, Giovanni Gherdovich <g.gherdovich at gmail.com> wrote:

> :::: (2) Is there a way to use revset queries in order to detect if a merge is gonna be criss-cross?
> ::::     Or some other way to build a criss-cross detector that isn't too hard to implement.
> 
> ok, dumb me.
> Pierre-Yves just answered on IRC, the "heads(::X and ::Y)" revset query
> gives the set of all candidates for LCA(X, Y).

BTW, the term you're looking for here is GCA (greatest common ancestor), not LCA.

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




More information about the Mercurial mailing list