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

Heuristics for merges

From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Thu, 30 Aug 2012 12:31:58 +0000

Hi,

I'm given a working copy and a merge from URL.

Is there any easy heuristics I can implement using the SVN 1.7 APIs to guide my user whether a sync-merge or a reintegrate merge is appropriate? I want to display a warning message when the merge will most likely fail.

I know that SVN 1.8 does similar calculations internally to implement "symmetric merge", but I'm just looking for a simple, fast heuristic using the public APIs, covering the basic use cases (we don't allow subtree merges or switches of subtrees, for example).

Best regards

Markus Schaber

--
___________________________
We software Automation.
3S-Smart Software Solutions GmbH
Markus Schaber | Developer
Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 | Fax +49-831-54031-50
Email: m.schaber@3s-software.com<mailto:m.schaber@3s-software.com> | Web: http://www.3s-software.com <http://www.3s-software.com/>
CoDeSys internet forum: http://forum.3s-software.com<http://forum-en.3s-software.com/>
Download CoDeSys sample projects: http://www.3s-software.com/index.shtml?sample_projects
Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915
Received on 2012-08-30 14:32:35 CEST

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