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

Subversion conflict resolution

From: Sjoerd Tieleman <Sjoerd.Tieleman_at_phil.uu.nl>
Date: 2005-11-11 19:14:59 CET

Hi all,

Can any of you tell me what the status is of the "Smart conflict
resolution" in Subversion (as described in the Subversion design
document: <http://subversion.tigris.org/files/documents/15/17/svn-
design.html#Smart%20conflict%20resolution>)? At the moment it doesn't
seem that there is any (or much) work on this subject done for
Subversion, but I might be mistaken.
I am a student in Cognitive Artificial Intelligence at the Utrecht
University, and I am currently preparing to write my masters thesis.
At the moment, it looks like my thesis will touch a variety of
subjects, including version control, structure-preserving merges
(think of XML files, or more generally trees) and automatic conflict
resolution (as one would want in a version control system).
If there hasn't been any work on this, would you happen to know
places where one could find this kind of information (and if there
even is interest in such a feature)?

Kind regards,

Sjoerd Tieleman.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 11 19:16:04 2005

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