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

Automatic conflict resolution

From: Sjoerd Tieleman <sjoerd.tieleman_at_phil.uu.nl>
Date: 2005-11-07 14:10:21 CET

Hi all,

I'm currently in the process of preparing to write my master's
thesis, which will probably deal with version management, data
synchronization, merging of data structures (for example tree-based
merging or graph-based merging, as opposed to line-based merging) and
it will probably also contain some areas regarding Subversion.
My question is: is there information available (other than the source
code) which lists the various 3-way merge cases which Subversion can
perform automatically? Ofcourse, the most interesting ones will be
the conflicting ones, so what I'm basically looking for is
information on automatic conflict resolution in Subversion. I can't
seem to find very much about it on the Internet (other than the fact
that at 1.0 Subversion didn't even have automatic conflict resolution).

Thanks in advance,

Sjoerd Tieleman.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 7 14:16:23 2005

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.