Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
From: Apache Wiki <wikidiffs@apache.org>
To: Apache Wiki <wikidiffs@apache.org>
Date: Wed, 09 Nov 2011 12:32:20 -0000
Message-ID: <20111109123220.96673.43288@eos.apache.org>
Subject: 
 =?utf-8?q?=5BSubversion_Wiki=5D_Update_of_=22KeepingReintegratedBranchAli?=
 =?utf-8?q?ve=22_by_JulianFoad?=
Auto-Submitted: auto-generated

Dear Wiki user,

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

The "KeepingReintegratedBranchAlive" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/KeepingReintegratedBranchAlive?action=3Dd=
iff&rev1=3D1&rev2=3D2

  =

  Ways to make it easier:
  =

-  * Make it easier for the user to do the record-only dance: make 'svn mer=
ge' print the required command at the end of the merging, and perhaps store=
 info in the WC and make 'svn commit' notice and at least print a reminder =
and possibly even do that commit.
+  * Make it easier for the user to do the record-only dance: make 'svn mer=
ge' print the required command at the end of the merging. Perhaps store inf=
o in the WC and make 'svn commit' notice and at least print a reminder. Pos=
sibly even have 'svn commit' do that keep-alive commit after the regular co=
mmit. (With the current mergeinfo design it needs to be a separate commit b=
ecause it needs to reference the rev number of the first commit.)
+  {{{
+ svn merge --reintegrate ^/branches/this-branch trunk-wc
+ --- Merging ...
+ [...]
+ To continue using the source branch after this reintegration, note the
+ new revision number REV created by the commit and perform the following
+ command in a working copy of that branch:
+ =

+   svn merge --record-only --change REV ^/trunk .
+ }}}
+ =

+  * Make the reintegrate command optionally commit the result if there are=
 no conflicts (which is typically the case, if the branch was up to date an=
d the trunk isn't too busy). After the reintegrate command commits the rein=
tegration, make it do the keep-alive commit directly in the repo. It would =
require a clean WC so that it knows this reintegration is the only thing it=
 is committing.
+  {{{
+ svn merge --reintegrate --commit ^/branches/this-branch trunk-wc
+ --- Merging ...
+ [...]
+ --- Committing ...
+ [...]
+ Committed revision 1234.
+ --- Committing a mergeinfo adjustment to keep the source branch alive ...
+ [...]
+ Committed revision 1235.
+ }}}
+ =

-  * Make a no-WC reintegrate command, that performs the reintegrate and co=
mmits it, and then does the record-only straight into the repo. This work-f=
low is possible because typically there should be no conflicts when reinteg=
rating; bail out if there are.
+  * Make a no-WC reintegrate command, that performs the reintegrate and co=
mmits it, and then does the record-only straight into the repo. This work-f=
low is possible because typically there should be no conflicts when reinteg=
rating; bail out if there are. It might be hard without a WC, might need so=
me Subversion library re-architecting.
   * Make the "sync merge" code recognize the reintegration revision withou=
t 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 tim=
e. Difficult I know.
 =20