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

RE: Smarter Merging?

From: Dale Worley <dworley_at_pingtel.com>
Date: 2004-12-07 16:21:05 CET

From: David Abrahams
> ...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.

There is a contributed program called "svnmerge" that does a great deal of
this.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 7 16:23:41 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.