[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Daniel L. Rall <dlr_at_finemaltcoding.com>
Date: Fri, 30 May 2008 15:46:38 -0700

Looks pretty good to me.

On Fri, 30 May 2008, Marc Strapetz wrote:

> 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 ...
>
> --
> Best regards,
> Marc Strapetz
> _____________
> SyntEvo GmbH
> www.syntevo.com
>
>
>
>

> Index: www/svn_1.5_releasenotes.html
> ===================================================================
> --- www/svn_1.5_releasenotes.html (revision 31532)
> +++ www/svn_1.5_releasenotes.html (working copy)
> @@ -462,6 +462,30 @@
> properties to the <tt>svn:mergeinfo</tt> properties that Subversion
> itself now uses.</p>
>
> +<div class="h4" id="mt-known-limitations" title="mt-known-limitations">
> +<h4>Known Limitations</h4>
> +
> +<p>Merge tracking information can currently include the "natural history"
> +of a path. A common situation where this gets apparent is when creating
> +a <tt>branch</tt> from <tt>trunk</tt> at a certain revision <tt>X</tt> and
> +later merging all changes from <tt>branch</tt> back to <tt>trunk</tt> without
> +explicitly limiting the merge range.
> +In this case merge tracking information on <tt>trunk</tt> will also contain
> +revisions before <tt>X</tt>. This does no harm to future merge operations
> +but <code>svn log -g</code> on <tt>trunk</tt> will report these revisions from the
> +"natural history" what is typically not expected.</p>
> +
> +<p>Because <code>svn log -g</code> uses the merge tracking information as it
> +was present at a specific revision (not only at HEAD) this has to be
> +corrected before committing a merged revision. One solution is to avoid this
> +situation at all by explicitly specifying merge ranges, e.g. <tt>-rX:HEAD</tt>.
> +Another approach is to reverse merge the "natural history" information by
> +<code>svn merge --record-only -rX:1</code>.
> +Future Subversion releases will address this problem, for more details refer to
> +<a
> +href="http://subversion.tigris.org/issues/show_bug.cgi?id=3157"
> +>Issue 3157</a>.</p>
> +
> </div> <!-- mt-compatibility -->
>
> <div class="h4" id="mt-further-reading" title="mt-further-reading">

> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org

-- 
Daniel Rall

  • application/pgp-signature attachment: stored
Received on 2008-05-31 00:46:56 CEST

This is an archived mail posted to the Subversion Dev mailing list.