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

svnbook at googlecode.com svnbook at googlecode.com
Fri Nov 4 15:09:33 CDT 2011

Revision: 4157
Author:   ptburba at gmail.com
Date:     Fri Nov  4 13:08:56 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchemerge.basicmerging.reintegrate): Mention reintegrate's
    increased flexibility re subtree merges in 1.7, but do it in
    a footnote; this is really not something we want to encourage
    (though apparently some folks like to work this way).



--- /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 12:00:53 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 13:08:56 2011
@@ -867,7 +867,14 @@
          branch changes back to the trunk (so your team can enjoy the
          bounty of your labor).  The process is simple.  First, bring
          your branch in sync with the trunk again, just as you've been
-        doing all along:</para>
+        doing all along<footnote><para>With Subversion 1.7 you don't
+        absolutely have to do all your sync merges to the root of your
+        branch as we do in this example.  <emphasis>If</emphasis> your
+        branch is effectively synced via a series of subtree
+        merges then the reintegrate will work, but ask yourself, if the
+        branch is effectively synced, then why are you doing subtree
+        merges? Doing so is almost always needlessly
+        complex.</para></footnote>:</para>


More information about the svnbook-dev mailing list