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

Re: difference between svn and regular merge?

From: Roel Schroeven <rschroev_nospam_ml_at_fastmail.fm>
Date: 2006-05-02 09:54:31 CEST

John Joseph Bachir schreef:

> Is there any difference between how svn merges, and regular command-line
> merge? I've asked some folks about this before, and the answer is
> usually a vague "svn uses the file history data". I don't understand
> what that means... I can't imagine what extra data a program could have
> about the differences between two files. Or is the magic in the
> merging... does it somehow incrementally and therefore more "carefully"
> do the merges into the 3rd file?

I think the difference is mostly in keeping track of changes to trees:
renames, additions of files, removal of files. I don't think there's any
difference of you're just merging the changes in a file.

If I have been able to see further, it was only because I stood
on the shoulders of giants.  -- Isaac Newton
Roel Schroeven
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 2 09:55:53 2006

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.