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

How does Subversion decide what gets automatically merged?

From: Cem Karan <ckaran_at_arl.army.mil>
Date: 2007-08-10 14:19:37 CEST

I'm trying to write some documentation for how to use svn at work,
and have just realized that I don't understand one part of
subversion's algorithms; namely, how does svn decide which files can
be automatically merged, and which can't? E.g., if I'm working on a
text file, and someone else is as well, but in another part of the
file, svn will automatically merge the two without conflicts, but if
I've got a PDF in the repository that gets updated once in a while, a
conflict will be detected even if I and my coworker are editing
totally different parts of the PDF. I'm guessing that this is based
on the MIME type, but I want to be sure.

Cem Karan

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 10 14:18:34 2007

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.