AW: Heuristics for merges

2012-08-30 Thread Markus Schaber
Hi, Julian, Von: Julian Foad [mailto:julianf...@btopenworld.com] > > Markus Schaber wrote: > > 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 appropr

Re: Heuristics for merges

2012-08-30 Thread Julian Foad
Markus Schaber wrote: > 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

Heuristics for merges

2012-08-30 Thread Markus Schaber
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