Greg Stein <firstname.lastname@example.org> writes:
> On Fri, Mar 30, 2001 at 01:40:39PM -0600, Karl Fogel wrote:
> > 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...)
> Merge happens *after* the fact. I'm checking before even starting a change.
> To use merge, I'd have to wait for the postfix deltas, change the nodes in
> my transaction, then attempt the merge to see if it was legal to do the
> postfix delta in the first place!
Merge only looks at node-rev-ids and their relationship to one
another. It makes no difference what their contents are. That's why
I was planning to call merge() after each skeletal change, before any
textdeltas were sent.
But now I'm with you Greg...
> Second, if I pass directories to merge, then I'm kinda screwed, no? It will
> recurse all the way down...
Yah, this is inefficient. :)
We need that new fs routine.
Received on Sat Oct 21 14:36:26 2006