subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Subversion Wiki] Update of "KeepingReintegratedBranchAlive" by JulianFoad
Date Wed, 09 Nov 2011 12:32:20 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=1&rev2=2

  
  Ways to make it easier:
  
-  * Make it easier for the user to do the record-only dance: make 'svn merge' 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 merge' print the required
command at the end of the merging. Perhaps store info in the WC and make 'svn commit' notice
and at least print a reminder. Possibly even have 'svn commit' do that keep-alive commit after
the regular commit. (With the current mergeinfo design it needs to be a separate commit because
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 and the trunk isn't too busy). After the
reintegrate command commits the reintegration, 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 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.
+  * 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.
  

Mime
View raw message