Thanks for the feedback. poolie is taking over this patch from here so I
can focus on the Windows installer. I'll let him look deeper but some
quick comments on your first point ...
> Specifically, you look up a path in one tree, and use that to select filters in a different tree (this is at the very top of your patch).
The patch mightn't be quite right. I can say however that this cross
tree stuff is tricky. Keep in mind that:
* in the case of reverting a removed file, its path doesn't exist
in the working tree so the only place to find that is the rev-tree
* rules aren't stored historically so, IIRC, revtrees don't know
what they are - only the WT knows that.
So looking up a path in the revtree and using the filters from the WT
may indeed be correct, in the case of revert at least.
Merging has similar challenges. A new path may only exist in the OTHER
tree say but the filters applied need to come from the working tree
being merged into.
Robert Collins wrote:
> Review: Needs Fixing
Thanks for the feedback. poolie is taking over this patch from here so I
can focus on the Windows installer. I'll let him look deeper but some
quick comments on your first point ...
> Specifically, you look up a path in one tree, and use that to select filters in a different tree (this is at the very top of your patch).
The patch mightn't be quite right. I can say however that this cross
tree stuff is tricky. Keep in mind that:
* in the case of reverting a removed file, its path doesn't exist
in the working tree so the only place to find that is the rev-tree
* rules aren't stored historically so, IIRC, revtrees don't know
what they are - only the WT knows that.
So looking up a path in the revtree and using the filters from the WT
may indeed be correct, in the case of revert at least.
Merging has similar challenges. A new path may only exist in the OTHER
tree say but the filters applied need to come from the working tree
being merged into.
Ian C.