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

Merge symmetry (was: Tree Conflicts with Subversion 1.7)

From: Andreas Krey <a.krey_at_gmx.de>
Date: Fri, 19 Aug 2011 16:15:38 +0200

On Fri, 19 Aug 2011 13:51:40 +0000, Stein Somers wrote:

> Now I realize merges are always asymmetric.

Actually, merging is a symmetric operation. The tree (and copyfrom
info) resulting from a merge should be the same independent of in
which direction the merge is performed. In svn the metadata just looks
completely different depending on the direction of the merge. (It also
is different due to the necessity of --reintegrate.)

Andreas 

-- 
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800
Received on 2011-08-19 16:16:15 CEST

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.