Jim Blandy <firstname.lastname@example.org> writes:
> > But: Greg, were you aware that svn_fs_merge() is not only for trees?
> > It just takes three roots and three paths -- those pairs can result in
> > any kind of object. So maybe svn_fs_merge() gives you the information
> > you need after all. (Or maybe not? Let us know...)
> I think it doesn't, because Greg does his merge with no base node
> whatsoever. He never ever looks at the base revision. He stashes
> exactly the information the merge needs from the base revision in
> those wc properties, so he never actually needs the base revision
> So any function that operates on three actual nodes isn't useful to
> him; he only needs two nodes, and some administrative info.
> Is that right, Greg?
This is effectively what Greg just said on the phone to me.
So -- we'll probably need to write one new fs routine that both RA
layers can use.
Received on Sat Oct 21 14:36:26 2006
This is an archived mail posted to the Subversion Dev