Re: [PATCH] Release Notes: Information on the "natural history" currently present in svn:mergeinfo

> Wait -- I think you're right, and I misdocumented it a bit in the
> release notes just now. It *is* for feature branches, not for release
> branches (well, release branches shouldn't get merged back to trunk
> anyway).

We are fixing bugs directly in the release branch and from time to time
are merging these revisions back to the trunk (this was the situation I
had in mind when changing the release notes). Here the natural history
problem becomes apparent.

As far as I understand now, for "release branches" (in the Subversion
notion), there is no problem as trunk is merged to branch. For feature
branches, there is also no problem, because here --reintegrate is used.

Maybe there is another typical use case where "normal" merges are
performed from a descendant branch back to its parent which could be
used to illustrate the problem in the release notes?

--
Best regards,
Marc Strapetz
_____________
SyntEvo GmbH
www.syntevo.com
Karl Fogel wrote:
> Marc Strapetz <marc.strapetz_at_syntevo.com> writes:
>> I was not aware that --reintegrate is the recommended way to
>> continuously merge back changes from a *release* branch; instead I
>> thought it would only be useful for *feature* branches.
>>
>> So in my opinion it would be helpful to have most parts of Mark
>> Phippard's reply also part of the SVN book. Furthermore, it might be
>> helpful to have a short overview on feature branches vs. release
>> branches and when to use --reintegrate resp. "normal" merge here.
> 
> Wait -- I think you're right, and I misdocumented it a bit in the
> release notes just now.  It *is* for feature branches, not for release
> branches (well, release branches shouldn't get merged back to trunk
> anyway).
> 
> Is this your understanding too?
> 
> 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org