Re: [Gnu-arch-users] [PATCH] arch speedups on big trees

[Chris Mason]

On Fri, 2003-12-19 at 15:03, Tom Lord wrote:
>     > From: Chris Mason <address@hidden>
> 
>     > Sorry, sounds like I need to understand arch merging better.
>     > How is it different?
> 
> During mering, a file named by a changeset may not exist at all or may
> exist at a different relative location to the top of the tree.  A file
> or directory having the same relative path as something mentioned in
> the changeset may, in fact, be a different file or directory (for the
> purposes of patching).
> 
> In those cases where a mentioned file exists in the target tree (but
> in a different place), arch_apply_changeset still needs to find it.
> It uses the file id, not the relative path, to map (for example) a
> .patch within the changeset to the file to which to apply that patch.

Gotcha, that is a problem.  It seems we should be able to detect most
variations on this though (patching/deleting a file that doesn't exist,
etc), and just trigger a full inventory.

The part we won't catch is if the merge source creates a file at one
location and that file already exists at a different location with the
same id.  Looking at the the changeset code, I don't see how that gets
handled right now.

-chris