comparison en/ch02-tour-merge.xml @ 828:477d6a3e5023

Many final changes.

827:d2aacc06e562

	  parents</command> and the contents of
	<filename>hello.c</filename>.</para>

      &interaction.tour.merge.parents;
    </sect2>
    <sect2>
      <title>Committing the results of the merge</title>

      <para id="x_348">Whenever we've done a merge, <command role="hg-cmd">hg
	  parents</command> will display two parents until we <command

	available, too many to cover here.  They vary in which
	platforms they are available for, and in their particular
	strengths and weaknesses.  Most are tuned for merging files
	containing plain text, while a few are aimed at specialised
	file formats (generally XML).</para>

    </sect2>
    <sect2>
      <title>A worked example</title>

      <para id="x_359">In this example, we will reproduce the file modification
	history of <xref linkend="fig:tour-merge:conflict"/>

	  you should strongly consider upgrading to a newer version
	  before trying to tackle complicated merges.</para>
      </note>
    </sect2>
  </sect1>
  <sect1 id="sec:tour-merge:fetch">
    <title>Simplifying the pull-merge-commit sequence</title>

    <para id="x_362">The process of merging changes as outlined above is
      straightforward, but requires running three commands in

    <para id="x_368">(Normally, the right-hand side of the
      <quote><literal>=</literal></quote> would indicate where to find
      the extension, but since the <literal
	role="hg-ext">fetch</literal> extension is in the standard
      distribution, Mercurial knows where to search for it.)</para>

  </sect1>
</chapter>

<!--
local variables: 

828:477d6a3e5023

	  parents</command> and the contents of
	<filename>hello.c</filename>.</para>

      &interaction.tour.merge.parents;
    </sect2>

    <sect2>
      <title>Committing the results of the merge</title>

      <para id="x_348">Whenever we've done a merge, <command role="hg-cmd">hg
	  parents</command> will display two parents until we <command

	available, too many to cover here.  They vary in which
	platforms they are available for, and in their particular
	strengths and weaknesses.  Most are tuned for merging files
	containing plain text, while a few are aimed at specialised
	file formats (generally XML).</para>
    </sect2>

    <sect2>
      <title>A worked example</title>

      <para id="x_359">In this example, we will reproduce the file modification
	history of <xref linkend="fig:tour-merge:conflict"/>

	  you should strongly consider upgrading to a newer version
	  before trying to tackle complicated merges.</para>
      </note>
    </sect2>
  </sect1>

  <sect1 id="sec:tour-merge:fetch">
    <title>Simplifying the pull-merge-commit sequence</title>

    <para id="x_362">The process of merging changes as outlined above is
      straightforward, but requires running three commands in

    <para id="x_368">(Normally, the right-hand side of the
      <quote><literal>=</literal></quote> would indicate where to find
      the extension, but since the <literal
	role="hg-ext">fetch</literal> extension is in the standard
      distribution, Mercurial knows where to search for it.)</para>
  </sect1>

  <sect1>
    <title>Renaming, copying, and merging</title>

    <para>During the life of a project, we will often want to change
      the layout of its files and directories. This can be as simple
      as renaming a single file, or as complex as restructuring the
      entire hierarchy of files within the project.</para>

    <para>Mercurial supports these kinds of complex changes fluently,
      provided we tell it what we're doing.  If we want to rename a
      file, we should use the <command>hg rename</command><footnote>
	<para>If you're a Unix user, you'll be glad to know that the
	  <command>hg rename</command> command can be abbreviated as
	  <command>hg mv</command>.</para>
      </footnote> command to rename it, so that Mercurial can do the
      right thing later when we merge.</para>

    <para>We will cover the use of these commands in more detail in
      <xref linkend="chap:daily.copy"/>.</para>
  </sect1>
</chapter>

<!--
local variables: