subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache subversion Wiki <comm...@subversion.apache.org>
Subject [Subversion Wiki] Update of "KeepingReintegratedBranchAlive" by JulianFoad
Date Mon, 09 Jan 2012 10:00:18 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.

The "KeepingReintegratedBranchAlive" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/KeepingReintegratedBranchAlive?action=diff&rev1=4&rev2=5

+ See "Keeping a Reintegrated Branch Alive" in the Svn Book here: http://svnbook.red-bean.com/en/1.6/svn-book.html#svn.branchmerge.advanced.reintegratetwice.
- See "Keeping a Reintegrated Branch Alive" in the Svn Book here:
- [[http://svnbook.red-bean.com/en/1.6/svn-book.html#svn.branchmerge.advanced.reintegratetwice]].
  
  Ways to make it easier (in order from easiest to implement to best for the user):
  
@@ -35, +34 @@

   * Make a no-WC reintegrate command, that performs the reintegrate and commits it, and then
does the record-only straight into the repo. This work-flow is possible because typically
there should be no conflicts when reintegrating; bail out if there are. It might be hard without
a WC, might need some Subversion library re-architecting.
   * Make the "sync merge" code recognize the reintegration revision without having to record-only
it on the branch. Either store a special marker in the svn:mergeinfo at reintegrate time,
or deduce the fact at sync-merge time. Difficult I know.
  
+ ||Rev ||A ||B ||Commit ||
+ 
+ 
+ ||r10 ||X || || ||
+ ||r20 || ||X ||New branch B from A ||
+ ||r30 || ||X ||Modify B ||
+ ||r40 ||M || ||Reintegrate B to A ||
+ ||<style="text-decoration:line-through;">r45 ||<style="text-decoration:line-through;">
||<style="text-decoration:line-through;">R ||--(Keep-alive record-only merge A@40 to
B)-- ||
+ ||r50 ||X || ||More work in A ||
+ ||r60 || ||M ||Sync merge A to B ||
+ 

Mime
View raw message