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

Re: svn merge != svn diff | patch

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2007-08-03 22:58:05 CEST

> I seem to misunderstand "svn merge". As per the SVN handbook, svn merge
> computes a diff between the 1st two arguments and applies it to the 3rd.
> This is not what happens according to my experience.

This is the poor-mans explanation of ...

[ snip ]

> That is: svn merge produces conflicts instead of the obvious merge;
> moreover, it is unable to suggest the obvious merge as one of the
> alternatives. In fact, it really seems to try a 3-way merge between f@1,
> f@3 and g (such as kdiff3 does) which is very different from diffing f@1
> and f@3 and applying to g.

This. Exactly: svn merge is a diff3 implementation. (iow: a 3-way merge)

HTH,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 3 22:56:36 2007

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