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

[merge-tracking] bidirectional merges

From: Raman Gupta <rocketraman_at_fastmail.fm>
Date: 2006-07-13 03:54:13 CEST

Hi, I've read through the use cases for the new merging support. Is
the use case of bidirectional merging implied or missing?

Example: merging all available changes from branch A to branch B, then
merging all available changes from branch B back to branch A. This
would be relatively common on a long-lived feature branch.

This paragraph in the cherry picking section hints at it:

> Additionally, it's important to be able to cherry pick changes in
> multiple different directions. For example, if you create a release
> branch B by copying the trunk you should be able to both forward
> port changes made on B into trunk and backport changes made on trunk
> into B without confusing the merge tracking algorithm.

However, cherry-picking implies that the user is picking specific
changes to merge, which means that they would generally not pick the
"reflected" changes. On a feature branch one would generally just
merge over all available changes, which for a naive implementation
would include the reflected changes merged from the target branch.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 13 03:54:44 2006

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.