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

RE: [Subversion Wiki] Update of "KeepingReintegratedBranchAlive" by JulianFoad

From: Richard Mayhew <richard.mayhew_at_gtspt.com>
Date: Wed, 11 Jan 2012 18:39:25 +0200

Unsubscribe please

Kind regards

Richard

Richard Mayhew | Systems Developer & Delivery | mayhew.richard
Gaming Technology Solutions Ltd, a Playtech company | Waterfront House | 1A
Wherry Quay | Ipswich | IP4 1AS

Privileged/confidential information may be contained in this message. If you
are not the addressee indicated in this message (or responsible for delivery
of the message to such person), you may not copy or deliver this message to
anyone. In such case, you should destroy this message and kindly notify the
sender by reply e-mail. Please advise immediately if you or your employer do
not consent to Internet e-mail for messages of this kind

-----Original Message-----
From: Apache subversion Wiki [mailto:commits_at_subversion.apache.org]
Sent: 09 January 2012 10:00
To: Apache subversion Wiki
Subject: [Subversion Wiki] Update of "KeepingReintegratedBranchAlive" by
JulianFoad

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_at_40 to B)-- ||
+ ||r50 ||X || ||More work in A ||
+ ||r60 || ||M ||Sync merge A to B ||
+

  • application/x-pkcs7-signature attachment: smime.p7s
Received on 2012-01-11 17:40:03 CET

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