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

Merge tracking between several parallel branches

From: Fredrik Orderud <forderud_at_gmail.com>
Date: Tue, 21 Dec 2010 00:20:02 +0100

I have some questions regarding the status of the merge tracking
functionality in subversion 1.6.  Based on my understanding, it seems
like svn has good “automatic” support for merging between branches in
one direction, whereas cyclic/bidirectional merging requires a more
complex “reintegrate” + “record only” merge procedure. I am wondering
if this support also extends to scenarios with repeated merging
between several parallel release branches.

Does svn handle arbitrary "directed acyclic" merging between several
parallel branches, when merging is always conducted in the same
direction (e.g. from old to newer release branch)?

Does the “reintegrate” + “record only” merge procedure extend
gracefully to scenarios with arbitrary cyclic/bidirectional merging
between several parallel branches?

Thanks in advance,
Fredrik Orderud
Received on 2010-12-21 15:08:30 CET

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.