From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Sat, 03 Sep 2005 00:20:41 GMT
Subject: Re: Moved files and merges
Message-ID: <46a038f90509021720417a9b59@mail.gmail.com>
In-Reply-To: <4318E754.9000703@zytor.com>

On 9/3/05, H. Peter Anvin <hpa@zytor.com> wrote:
> Is there any way I can record in the repository that these files are
> actually moved files, and that the merge should apply the patch elsewhere?

Well, if you run pickaxe at merge-time on the file-paths that weren't
found, you can probably walk the pickaxe output until you find the
file move, and then reapply the patches.

Probably should be hacked into cg-merge. When the merge reports a file
is missing, what happens? Does it leave a .rej file or anything?

cheers


martin