You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.co.il> on 2008/06/02 21:14:52 UTC
Re: svn commit: r31558 - trunk/www
kfogel@tigris.org wrote on Mon, 2 Jun 2008 at 14:02 -0700:
> Author: kfogel
> Date: Mon Jun 2 14:02:19 2008
> New Revision: 31558
>
> Log:
> * www/svn_1.5_releasenotes.html
> (mt-known-limitations): New section, documenting merge tracking's
> Issue #3157 problem.
> (mt-reintegrate): New anchor, for above to link back to.
>
> Patch by: Marc Strapetz <ma...@syntevo.com>
> me
>
> Modified:
> trunk/www/svn_1.5_releasenotes.html
>
> Modified: trunk/www/svn_1.5_releasenotes.html
> URL: http://svn.collab.net/viewvc/svn/trunk/www/svn_1.5_releasenotes.html?pathrev=31558&r1=31557&r2=31558
> ==============================================================================
> --- trunk/www/svn_1.5_releasenotes.html Mon Jun 2 08:13:29 2008 (r31557)
> +++ trunk/www/svn_1.5_releasenotes.html Mon Jun 2 14:02:19 2008 (r31558)
> @@ -410,11 +410,13 @@ href="http://svnbook.red-bean.com/nightl
> >Blocking Changes</a> in the Subversion book, for more details.)</p>
> </div> <!-- mt-record-only -->
>
> +<div id="mt-reintegrate" title="mt-reintegrate">
> <p>The --reintegrate option is used when merging a branch back to
> trunk; it checks for some common safeguard conditions and then does
> the merge in a fast and efficient way. See <a
> href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync"
> >Keeping a branch in sync</a> in the Subversion book for more.</p>
> +</div> <!-- mt-reintegrate -->
>
> <p>The new <strong><code>svn mergeinfo</code></strong> command can
> show which changesets a directory has absorbed and which changesets
> @@ -462,6 +464,42 @@ href="https://svn.collab.net/repos/svn/t
> 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">
^^^
New <div> tag...
> +<h4>Known Limitations</h4>
> +
> +<p>[This section describes a problem that is being fixed in
> +development versions of Subversion, and releases in the near future
> +will contain those fixes. See <a
> +href="http://subversion.tigris.org/issues/show_bug.cgi?id=3157" >Issue
> +#3157</a> for more details.]</p>
> +
> +<p>Merge tracking information currently can include the "natural
> +history" of a path. One situation where this happens 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 and
> +without using the recommended <a href="#mt-reintegrate"
> +><code>--reintegrate</code> option</a>. Afterwards, the merge
> +tracking information on <tt>trunk</tt> will list revisions before
> +<tt>X</tt>. This does no harm to future merge operations, but
> +thereafter <code>svn log -g</code> on <tt>trunk</tt> will report these
> +revisions from the "natural history", which is typically not expected.
> +This is because <code>svn log -g</code> uses the merge tracking
> +information from previous revisions (not only from HEAD).</p>
> +
> +<p>One workaround is to correct the merge tracking information before
> +committing the merged revision, by reverse merging the "natural
> +history" information: <code>svn merge --record-only -rX:1</code>.
> +Another solution is to avoid this situation entirely, by explicitly
> +specifying merge ranges in the first place, e.g.: <tt>-rX:HEAD</tt>.
> +See <a
> +href="http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=139379"
> +>this mail</a> for more information.</p>
> +
> +<p>The best solution is to to <a href="#mt-reintegrate" >use the
> +<code>--reintegrate</code> option</a>. If you do, the above problem
> +won't happen.</p>
> +
... but no new </div> tag.
I'm not sure if you meant to nest the two <h4> sections or not. If you
didn't, this should fix it:
Index: www/svn_1.5_releasenotes.html
===================================================================
--- www/svn_1.5_releasenotes.html (revision 31558)
+++ www/svn_1.5_releasenotes.html (working copy)
@@ -464,6 +464,8 @@ href="https://svn.collab.net/repos/svn/trunk/contr
properties to the <tt>svn:mergeinfo</tt> properties that Subversion
itself now uses.</p>
+</div> <!-- mt-compatibility -->
+
<div class="h4" id="mt-known-limitations" title="mt-known-limitations">
<h4>Known Limitations</h4>
@@ -500,7 +502,7 @@ href="http://subversion.tigris.org/servlets/ReadMs
<code>--reintegrate</code> option</a>. If you do, the above problem
won't happen.</p>
-</div> <!-- mt-compatibility -->
+</div> <!-- mt-known-limitations -->
<div class="h4" id="mt-further-reading" title="mt-further-reading">
<h4>Further reading</h4>
> </div> <!-- mt-compatibility -->
>
> <div class="h4" id="mt-further-reading" title="mt-further-reading">
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r31558 - trunk/www
Posted by Karl Fogel <kf...@red-bean.com>.
Daniel Shahaf <d....@daniel.shahaf.co.il> writes:
> New <div> tag...
>
> ... but no new </div> tag.
>
> I'm not sure if you meant to nest the two <h4> sections or not. If you
> didn't, this should fix it:
Thanks, r31559.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org