On 10/16/2016 04:32 PM, Gábor Stefanik wrote:
# HG changeset patch
# User Pierre-Yves David <pierre-yves.da...@ens-lyon.org>
# Date 1476315014 -7200
#      Thu Oct 13 01:30:14 2016 +0200
# Node ID bfb99ef3749757161bf439cc0ec678de46e24672
# Parent  92dfc856c6cc25366eb8a7fb9b59d992ad5efc36
mergecopies: rename 'ca' to 'base'

This variable was named 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. Similar rename
was also applied to 'checkcopies' in a prior changeset.

Hum I though I already got these one in, but I did not. Let me emails these first four myself for clarity.


Pierre-Yves David
Mercurial-devel mailing list

Reply via email to