[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: Greg Stein <gstein_at_lyra.org>
Date: 2001-03-31 02:13:32 CEST

[ just to clarify for myself; Jim sees complexity, so I'd like to understand
  it better since nobody likes complexity :-) ]

On Fri, Mar 30, 2001 at 05:53:33PM -0500, Jim Blandy wrote:
> 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?

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.

[ and, of course, there is always the final merge at commit time in case
  another revision was created while the transaction was being built ]


Greg Stein, http://www.lyra.org/
Received on Sat Oct 21 14:36:26 2006

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