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

Re: What mechanisms for code comparison and merge between versions on svn are used?

From: Hyrum K Wright <hyrum.wright_at_wandisco.com>
Date: Mon, 11 Jun 2012 13:45:48 +0200

On Sun, Jun 10, 2012 at 8:51 AM, Carlos Andrade <carlosviansi_at_gmail.com> wrote:
> Hi,
>
> I was interested on learning more about the mechanisms used on svn to verify
> if a certain code has been modified or not and how the merge function works.
> Is there any non-code documentation available for this? I would also be
> interested on knowing if svn employs any abstract syntax tree comparisons
> during this comparison between versions and merging (or maybe anywhere else)
> for any of its usage.

I'm not sure what you are asking for, but I'll try. Subversion just
treats files as streams of bits, and compares them (often using hashes
and mtimes) to see what has changed. Subversion does special case
known text files, based upon mimetype and some simple heuristics, and
when merging them uses line granularity to do so. We don't use any
language-specific comparison or merging.

> (I hope I hit the right mailing list since this is not usage related).

It's not development-related, either. :)

-Hyrum

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Received on 2012-06-11 13:46:25 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.