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

Re: svn diff, svn merge, and vendor branches (long)

From: Branko Čibej <brane_at_xbc.nu>
Date: 2002-12-12 02:54:46 CET

Tom Lord wrote:

>"How can we tack some kind of repeated merging support onto svn?" is,
>I think, a question that ignores important design context.
Hear, hear! Thanks, Tom, I couldn't have put it better myself.

Before anyone starts hacking on the repeated-merge problem, I strongly
suggest they read Tom's post _very_ carefully. It's a bit more abstract
than what we're used to dealing with there, but that's as it should be.

Now, before you quit out of sheer intellecutal stress :-) let me point
out that answers to a lot of Tom's points are already buried within
Subversion. The first order of business, then, is to translate those
design points into terminology we're used to dealing with every day --
filesystem revisions, NodeChanges, FS transactions, etc. etc. Once we've
done that, two things should become obvious: a) Which of the
prerequisites Tom listed, if any, are missing from our design, and b)
How to best fit in the solution.

This is a quite radical departure from our usual hack-and-test approach,
but really, we've done enough damage that way. let me just hint that in
this case, the obvious solution is probably not the right one. That's
just a hunch -- but I've regretted ignoring my hunches before.

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Dec 12 02:55:37 2002

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