[PATCH 1 of 3] checkcopies: rename 'ca' to 'base'

Kevin Bullock kbullock+mercurial at ringworld.org
Thu Oct 13 10:59:13 EDT 2016


> On Oct 13, 2016, at 09:47, Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
> 
> On 10/13/2016 04:40 PM, Kevin Bullock wrote:
>>> On Oct 9, 2016, at 09:18, Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
>>> 
>>> # HG changeset patch
>>> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
>>> # Date 1475944722 -7200
>>> #      Sat Oct 08 18:38:42 2016 +0200
>>> # Node ID c06cb63082bf1111571fb6fc24bac2e23feefe00
>>> # Parent  2c8ec8c2ddfeb2d229b81eb5b11e3639fb34b0a0
>>> # EXP-Topic checkcopies
>>> checkcopies: rename 'ca' to 'base'
>>> 
>>> This variable was name after the common ancestor. It is actually the merge
>>> base that might differ from the common ancestor in the graft case. We rename the
>>> variable before a larger refactoring to clarify the situation.
>> 
>> One nit with this one: you also renamed `ma` to `mb` and didn't mention it in the description. Accepting anyway.
> 
> Ha yes, probably worth mentioning. The rename is motivated by the fact "ma" was the accronyms for "manifest ancestor" and the name change motivate a rename to "manifest base" → mb.

Yeah, that was pretty straightforward from reading the commit, so I didn't bother updating the description.

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



More information about the Mercurial-devel mailing list