On Sun, 16 Oct 2016 16:47:23 +0200, Pierre-Yves David 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 b8bb58f87a94f5b78beaa1db710c5ef69967dd4c
> # Parent  6f0dc570c4383ad42c572158af200d2142bbef4f
> # EXP-Topic checkcopies
> mergecopies: rename 'ca' to 'base'

LGTM. Queued the series, thanks.

> diff --git a/mercurial/copies.py b/mercurial/copies.py
> --- a/mercurial/copies.py
> +++ b/mercurial/copies.py
> @@ -285,14 +285,14 @@ def _makegetfctx(ctx):
>          return fctx
>      return util.lrucachefunc(makectx)
>  
> -def mergecopies(repo, c1, c2, ca):
> +def mergecopies(repo, c1, c2, base):
>      """
>      Find moves and copies between context c1 and c2 that are relevant
> -    for merging.
> +    for merging. 'base' will be used as the merge base.
>  
>      Returns four dicts: "copy", "movewithdir", "diverge", and
>      "renamedelete".
> -
> +`

Removed this garbage character. I wiped my screen physically, but it never
disappeared.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to