Re: Moved files and merges

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: 2005-09-03 10:20:41
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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Sat Sep 03 10:21:18 2005

This archive was generated by hypermail 2.1.8 : 2005-09-03 10:21:20 EST