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

What is the algorithm for 'svn merge'?

From: Karan, Cem \(Civ, ARL/CISD\) <CKaran_at_arl.army.mil>
Date: 2005-03-25 16:50:41 CET

Hi all, I'm hoping someone can explain this to me. What is the algorithm
behind svn merge? I ask because I see that svn can automatically merge
changes. I can see that this is easy to do if the changes between two
files are actually identical, but how does it handle things when there
are differences? How does it decide which changes go into the files and
which get left out? I just want to make sure that my C code doesn't
suddenly start acting funky due to a merge...
 
Thanks,
Cem Karan
Received on Fri Mar 25 16:54:42 2005

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