[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: transaction roots

From: Jim Blandy <jimb_at_zwingli.cygnus.com>
Date: 2001-04-01 01:09:17 CEST

Greg Stein <gstein@lyra.org> writes:
> > In your arrangement, you apply the modifications and do the merge in
> > one pass. You get better locality, and less intermediate mucking
> > around in the database, but the logic is a bit more complex.
>
> Hmm. I didn't really think that I was doing a merge, but I think I see what
> you're talking about. I'm taking the latest revision for the transaction
> root, then making the WC's changes. That application of the WC's changes to
> the txn root is effectively merging. Is that what you mean?

Yes.

> Personally, it think it "just happens." All that I see is "make a tree. make
> some changes." The fact that "merging" happens is some kind of neato side
> effect to the process :-). This is why I asked where you saw the
> complexity.

Fair enough. Two sides of a coin.
Received on Sat Oct 21 14:36:26 2006

This is an archived mail posted to the Subversion Dev mailing list.