[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 <raman_at_rocketraman.com>
Date: 2006-07-25 07:01:03 CEST

Raman Gupta wrote:
> David James wrote:
>> 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:

Forgot the log message:

[[[
* www/merge-tracking/requirements.html
  (repeated-merge): Explicitly included the multi-directional
  merging use case. Gave the example of merging to/from a feature
  branch.
]]]

Here is the patch again so everything is in one email:

[[[
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">
]]]

Cheers,
Raman

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 27 15:44:32 2006

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