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

> Committed in r31558 with various tweaks (mention the --reintegrate
> option, etc).

It seems that I understand just by now the meaning of the
"--reintegrate" option and after reading Mark Phippard's replies around:

http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=78113

Regarding --reintegrate, currently the SVN book says: "And in fact it
does this by comparing the latest trunk tree with the latest branch
tree: the resulting difference is exactly your branch changes!", meaning
to me:

svn merge url://trunk@HEAD url://branch

instead of

svn merge url://trunk@LAST-REV url://branch

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.

--
Best regards,
Marc Strapetz
_____________
SyntEvo GmbH
www.syntevo.com
Karl Fogel wrote:
> Marc Strapetz <marc.strapetz_at_syntevo.com> writes:
>> As discussed in
>> http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=139270
>> the attached patch for the Release Notes explains the presence of the
>> "natural history" in the mergeinfo, impact on svn log -g and the
>> resolution for a simple example. Hopefully I got the point and it's
>> actually understandable ...
> 
> Committed in r31558 with various tweaks (mention the --reintegrate
> option, etc).  Thanks, Marc!
> 
> -Karl
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
> 
> 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org