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

Marc Strapetz <marc.strapetz_at_syntevo.com> writes:
> 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.

Ah. "Standard practice" is, I think, to fix such things on trunk and
merge the fixes out to the branches. At least, that's what we always do
for Subversion itself.

Obviously, it would be best if merge-tracking worked smoothly for both
Ways. For now, I think we should just document that doing it this way
is recommended and will avoid issue #3157.

> 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?

I can't think of a (recommended) case where normal merges are repeatedly
performed from a descendant branch back to its parent. We may just have
to cite the non-recommended case, and emphasize that it is not
recommended.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-03 19:56:45 CEST