On Wed, Nov 09, 2011 at 12:32:20PM -0000, Apache Wiki wrote: > 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 . > + }}}
Another idea: We could provide some way to mark a revision as merged without requiring a working copy. I.e. somehow propedit the svn:mergeinfo value on the branch as appropriate. I'm not suggesting to tell people to 'svn propedit' the svn:mergeinfo property, but to have a way to achieve the desired effect with 'svn merge'. For instance, we could allow --record-only merges on URL targets.
