[PATCH] merge: avoid to break the dirstate copy status on moved files

[Matt Mackall]

On Tue, 2010-05-04 at 09:57 +0200, Gilles Moris wrote:
> mercurial/merge.py |  3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> 
> # HG changeset patch
> # User Gilles Moris <gilles.moris at free.fr>
> # Date 1272959836 -7200
> # Node ID b3046a5f0653552e42c6043d16055995c2978f41
> # Parent  35ae6a16b7666185bbb5533c5e85e88c2364f6ea
> merge: avoid to break the dirstate copy status on moved files
> 
> In the case a file is locally tracked as copied in dirstate, and that a merge
> affects this file, this file should not be marked as modified in dirstate, as
> this will break the current copy state.
> Note: only affect working directory merge, not branch merge.

What's the state of this patch?

-- 
Mathematics is the supreme nostalgia of our time.