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

Re: How does Subversion decide what gets automatically merged?

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-08-10 14:23:29 CEST

On 8/10/07, Cem Karan <ckaran@arl.army.mil> wrote:
> 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.

Files that Subversion knows are plain-text (if you make good use of
svn:mime-type you can provide a lot of help to Subversion in making
this determination) it always attempts to merge. Binary files
generally can't be merged, so they normally produce a conflict.

---------------------------------------------------------------------
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:21:47 2007

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