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

Smarter Merging?

From: David Abrahams <dave_at_boost-consulting.com>
Date: 2004-12-07 15:38:33 CET

I know it's on the SVN "todo" list, and I'm sure it's harder than
it looks and people much more knowledgeable than I have probably
thought more deeply about it, but...

...It *seems* like it should be fairly easy to implement
something that uses properties to keep track of which revisions'
changes have been included in any revision of a file. From there
doing a smart merge is "just" a matter of repeatedly merging the
disjoint difference ranges between these two lists. The whole
scheme could be built into a proof-of-concept wrapper over svn to
begin with.

Any further insight into this problem would be much appreciated.

<waits nervously to be shot down>

Dave Abrahams
Boost Consulting
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 7 15:56:33 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.