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

Re: [merge-tracking] [PATCH] bidirectional merges

From: Raman Gupta <rocketraman_at_fastmail.fm>
Date: 2006-07-25 06:48:32 CEST

David James wrote:
> On 7/12/06, Raman Gupta <rocketraman@fastmail.fm> wrote:
>> 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.
>
> It's implied.

I thought as much but wanted to confirm because, for example, svnmerge
and svnmerge.py didn't originally have this functionality.

> We should probably clean up the use cases to make this a
> bit more clear. Raman, if you have a chance, could you update the
> use-case document to call out this case explicitly?

Patch:

Index: requirements.html
===================================================================
--- requirements.html (revision 20850)
+++ requirements.html (working copy)
@@ -103,6 +103,13 @@
 href="http://www.gnu.org/software/gnu-arch/">arch</a> claim to have
 already solved, what they're calling <em>star-merge</em>.</p>

+<p>Additionally, it's important to be able to repeatedly merge in
+multiple different directions. For example, if you create a feature
+branch B by copying the trunk you should be able to both keep B up
+to date with changes on trunk and integrate the new features on B
+back into the trunk without confusing the merge tracking
+algorithm.</p>
+
 </div> <!-- repeated-merge -->

 <div class="h4" id="cherry-picking">

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 25 06:49:16 2006

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