[svnbook] r4130 committed - * en/book/ch04-branching-and-merging.xml...

svnbook at googlecode.com svnbook at googlecode.com
Tue Nov 1 09:28:18 CDT 2011

Revision: 4130
Author:   ptburba at gmail.com
Date:     Tue Nov  1 07:27:08 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.basicmerging.mergeinfo): Describe the new 1.7
    notifications which occur when a merge updates mergeinfo to
    describe a merge (as opposed to the traditional notifications
    which describe the application of a diff).



--- /trunk/en/book/ch04-branching-and-merging.xml	Fri Oct 28 13:30:53 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  1 07:27:08 2011
@@ -952,7 +952,23 @@
          which is the source of the merged changes is
          <filename>/trunk</filename> and the directory which has
          received the changes is
-        <filename>/branches/my-calc-branch</filename>.</para>
+        <filename>/branches/my-calc-branch</filename>.
+        Earlier versions of Subversion maintained the
+        <literal>svn:mergeinfo</literal> property silently. You could
+        still detect the changes, after a merge completed, with the
+        <command>svn diff</command> or <command>svn status</command>
+        subcommands, but the merge itself gave no indication when it
+        changed the <literal>svn:mergeinfo</literal> property. This is no
+        longer true in Subversion 1.7, which has several new notifications
+        to alert you when a merge updates the
+        <literal>svn:mergeinfo</literal> property. These notifications
+        all begin with <quote>--- Recording mergeinfo for</quote>
+        and appear at the end of the merge.  Unlike other merge
+        notifications, these don't describe the application of a
+        difference to a working copy
+        (see <xref linkend="svn.branchmerge.advanced.advancedsyntax"/>),
+        but instead describe "housekeeping" changes made to keep
+        track of what was merged.</para>

        <para>Subversion also provides a subcommand, <command>svn
          mergeinfo</command>, which can be helpful in seeing not only

More information about the svnbook-dev mailing list