[PATCH 2 of 2] histedit: use base for computing renames when folding (issue3729)

Simon He. simohe at besonet.ch
Tue Jul 16 07:55:35 CDT 2013


It looks like the description is not correct. The 2nd time “copies.pathcopies(first, last)” should probably be “copies.pathcopies(BASE, last)” (in lowercase of course). This is at least what I understand from the title and the diff.

Greetings,
simohe

> # HG changeset patch
> # User Martin Geisler <martin at geisler.net>
> # Date 1373893482 -7200
> #      Mon Jul 15 15:04:42 2013 +0200
> # Branch stable
> # Node ID 33b5c323b4e878ff106a6167b5fdfb9b9b745b6b
> # Parent  02b3fca42ffba93191fd89b4a156af60840a66c4
> histedit: use base for computing renames when folding (issue3729)
>
> When a file was renamed in the very first changeset being histedited,
> the rename was not detected. Consider a history like this:
>
>    0  base: add a.txt
>    1  first: rename a.txt to b.txt
>    2  last: edit b.txt
>
> When 1 and 2 are edited, copies.pathcopies(first, last) correctly
> returns that nothing was renamed. We must instead use
> copies.pathcopies(first, last) to detect the initial rename.
>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
...



More information about the Mercurial-devel mailing list