[PATCH 1 of 3] copies: separate moves via directory renames from explicit copies

Siddharth Agarwal sid0 at fb.com
Fri Dec 21 17:04:10 CST 2012


On 12/21/2012 01:08 PM, Siddharth Agarwal wrote:
> diff --git a/mercurial/copies.py b/mercurial/copies.py
> --- a/mercurial/copies.py
> +++ b/mercurial/copies.py
> @@ -170,11 +170,17 @@ def mergecopies(repo, c1, c2, ca):
>       Find moves and copies between context c1 and c2 that are relevant
>       for merging.
>   
> -    Returns two dicts, "copy" and "diverge".
> +    Returns four dicts: "copy", "moveviadirmove", "diverge", and
> +    "renamedelete".
>

BTW I know the name "moveviadirmove" is not a very good one, but I 
couldn't think of a better one. Suggestions welcome.


More information about the Mercurial-devel mailing list