[svnbook] r3965 committed - * src/en/book/ch04-branching-and-merging.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Aug 9 07:48:23 CDT 2011
Revision: 3965
Author: cmpilato at gmail.com
Date: Tue Aug 9 05:47:38 2011
Log: * src/en/book/ch04-branching-and-merging.xml
Formatting, comment, and "trailing prompt" changes only.
http://code.google.com/p/svnbook/source/detail?r=3965
Modified:
/trunk/src/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml Fri Aug 5 20:01:09
2011
+++ /trunk/src/en/book/ch04-branching-and-merging.xml Tue Aug 9 05:47:38
2011
@@ -236,8 +236,9 @@
copies of trees. The main point here is that copies are
cheap, both in time and in space. If you create a branch
entirely within the repository (by running <userinput>svn copy
- <replaceable>URL1</replaceable>
<replaceable>URL2</replaceable></userinput>), it's a quick, constant-time
operation.
- Make branches as often as you want.</para>
+ <replaceable>URL1</replaceable>
<replaceable>URL2</replaceable></userinput>),
+ it's a quick, constant-time operation. Make branches as
+ often as you want.</para>
</sidebar>
</sect2>
@@ -256,6 +257,7 @@
A my-calc-branch/integer.c
A my-calc-branch/button.c
Checked out revision 341.
+$
</screen>
</informalexample>
@@ -272,22 +274,20 @@
commits happen:</para>
<itemizedlist>
- <listitem><para>
- You make a change to
- <filename>/calc/branches/my-calc-branch/button.c</filename>,
- which creates revision 342.</para>
+ <listitem>
+ <para>You make a change to
+ <filename>/calc/branches/my-calc-branch/button.c</filename>,
+ which creates revision 342.</para>
</listitem>
-
- <listitem><para>
- You make a change to
- <filename>/calc/branches/my-calc-branch/integer.c</filename>,
- which creates revision 343.</para>
+ <listitem>
+ <para>You make a change to
+ <filename>/calc/branches/my-calc-branch/integer.c</filename>,
+ which creates revision 343.</para>
</listitem>
-
- <listitem><para>
- Sally makes a change to
- <filename>/calc/trunk/integer.c</filename>, which creates
- revision 344.</para>
+ <listitem>
+ <para>Sally makes a change to
+ <filename>/calc/trunk/integer.c</filename>, which creates
+ revision 344.</para>
</listitem>
</itemizedlist>
@@ -301,8 +301,7 @@
</figure>
<para>Things get interesting when you look at the history of
- changes made to your copy of
- <filename>integer.c</filename>:</para>
+ changes made to your copy of <filename>integer.c</filename>:</para>
<informalexample>
<screen>
@@ -474,7 +473,7 @@
we <emphasis>strongly</emphasis> recommend that you make sure your
client and server are at least at version 1.5.</para>
- <!-- =============================================================== -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.changesets">
<title>Changesets</title>
@@ -515,12 +514,13 @@
Subversion's <command>svn merge</command> command is able to use
revision numbers. You can merge specific changesets from one
branch to another by naming them in the merge
- arguments: passing <userinput>-c 9238</userinput> to <command>svn
merge</command> would merge
- changeset r9238 into your working copy.</para>
-
- </sect2>
-
- <!-- =============================================================== -->
+ arguments: passing <userinput>-c 9238</userinput>
+ to <command>svn merge</command> would merge changeset r9238
+ into your working copy.</para>
+
+ </sect2>
+
+ <!-- ===============================================================
-->
<sect2 id="svn.branchemerge.basicmerging.stayinsync">
<title>Keeping a Branch in Sync</title>
@@ -554,6 +554,7 @@
--- Merging r345 through r356 into '.':
U button.c
U integer.c
+$
</screen>
</informalexample>
@@ -577,6 +578,7 @@
M .
M button.c
M integer.c
+$
</screen>
</informalexample>
@@ -613,6 +615,7 @@
Sending integer.c
Transmitting file data ..
Committed revision 357.
+$
</screen>
</informalexample>
@@ -642,6 +645,7 @@
Hunk #3 succeeded at 241.
Hunk #4 succeeded at 249.
done
+$
</screen>
</informalexample>
@@ -688,6 +692,7 @@
U integer.c
U Makefile
A README
+$
</screen>
</informalexample>
@@ -697,7 +702,7 @@
build, test, and <command>svn commit</command> the local
modifications to your branch.</para>
- </sect2>
+ </sect2>
<!-- ===============================================================
-->
<sect2 id="svn.branchemerge.basicmerging.reintegrate">
@@ -974,12 +979,14 @@
detail.</para>
<tip>
- <para>After performing a merge operation, but before committing
- the results of the merge, you can use <userinput>svn diff
- --depth=empty
<replaceable>/path/to/merge/target</replaceable></userinput> to see only
- the changes to the immediate target of your merge. If your
- merge target was a directory, only property differences will
- be displayed. This is a handy way to see the changes to the
+ <para>After performing a merge operation, but before
+ committing the results of the merge, you can
+ use <userinput>svn diff
+ --depth=empty
<replaceable>/path/to/merge/target</replaceable></userinput>
+ to see only the changes to the immediate target of your
+ merge. If your merge target was a directory, only property
+ differences will be displayed. This is a handy way to see
+ the changes to the
<literal>svn:mergeinfo</literal> property recorded by the
merge operation, which will remind you about what you've
just merged.</para>
@@ -991,9 +998,9 @@
modifications to your working copy—but we've already
stressed that you shouldn't be merging into such an
environment). If you don't like the results of the merge,
- simply run <userinput>svn revert . -R</userinput> to revert the
changes from
- your working copy and retry the command with different
- options. The merge isn't final until you
+ simply run <userinput>svn revert . -R</userinput> to revert
+ the changes from your working copy and retry the command with
+ different options. The merge isn't final until you
actually <command>svn commit</command> the results.</para>
<tip>
@@ -1684,7 +1691,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.mergeconflicts">
<title>More on Merge Conflicts</title>
@@ -1780,7 +1787,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.blockchanges">
<title>Blocking Changes</title>
@@ -1844,7 +1851,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.reintegratetwice">
<title>Keeping a Reintegrated Branch Alive</title>
@@ -1927,7 +1934,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.logblame">
<title>Merge-Sensitive Logs and Annotations</title>
@@ -2069,7 +2076,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.ancestry">
<title>Noticing or Ignoring Ancestry</title>
@@ -2135,7 +2142,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.moves">
<title>Merges and Moves</title>
@@ -2208,7 +2215,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.pre1.5clients">
<title>Blocking Merge-Unaware Clients</title>
@@ -2271,7 +2278,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.finalword">
<title>The Final Word on Merge Tracking</title>
@@ -2854,7 +2861,7 @@
Still, it may help to see them described in Subversion
terms.</para>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.commonpatterns.release">
<title>Release Branches</title>
@@ -2940,7 +2947,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.commonpatterns.feature">
<title>Feature Branches</title>
More information about the svnbook-dev
mailing list