On Fri, Mar 30, 2001 at 03:23:18PM -0600, Ben Collins-Sussman wrote:
> Greg Stein <email@example.com> writes:
> > 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.
Ah! But how do you generate a new node-rev-id if you don't have a delta? You
would need to actually change the node to an empty string or something
(temporarily; until the txdelta arrived). That would give you the new node
id, which fs_merge can then use for conflict detection.
> 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.
Yup. We can talk about the form/API next week.
Greg Stein, http://www.lyra.org/
Received on Sat Oct 21 14:36:26 2006