comparison en/ch02-tour-merge.xml @ 690:b788b405e141

Replace uses of <informalfigure> with <figure>

689:a2923aa93da9

      illustrated in figure <xref
	linkend="fig:tour-merge:sep-repos"/>.</para>

    &interaction.tour.merge.cat;

    <informalfigure id="fig:tour-merge:sep-repos">
      <mediaobject>
	<imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
	<textobject><phrase>XXX add text</phrase></textobject>
	<caption><para id="x_33e">Divergent recent histories of the <filename
	      class="directory">my-hello</filename> and <filename
	      class="directory">my-new-hello</filename>
	    repositories</para></caption>
      </mediaobject>
    </informalfigure>

    <para id="x_33f">We already know that pulling changes from our <filename
	class="directory">my-hello</filename> repository will have no
      effect on the working directory.</para>

	as they're also known.  The tip revision is thus a head,
	because the newest revision in a repository doesn't have any
	children, but a repository can contain more than one
	head.</para>

      <informalfigure id="fig:tour-merge:pull">
	<mediaobject><imageobject><imagedata
				    fileref="tour-merge-pull"/></imageobject><textobject><phrase>XXX 
	      add text</phrase></textobject>
	  <caption><para id="x_342">Repository contents after pulling from
	      <filename class="directory">my-hello</filename> into
	      <filename
		class="directory">my-new-hello</filename></para></caption>
	</mediaobject>
      </informalfigure>

      <para id="x_343">In figure <xref linkend="fig:tour-merge:pull"/>, you can
	see the effect of the pull from <filename
	  class="directory">my-hello</filename> into <filename
	  class="directory">my-new-hello</filename>.  The history that

	<command role="hg-cmd">hg merge</command> command to merge the
	two heads.</para>

      &interaction.tour.merge.merge;

      <informalfigure id="fig:tour-merge:merge">

	<mediaobject><imageobject><imagedata
				    fileref="tour-merge-merge"/></imageobject><textobject><phrase>XXX 
	      add text</phrase></textobject>
	  <caption><para id="x_346">Working directory and repository during
	      merge, and following commit</para></caption>
	</mediaobject>
      </informalfigure>

      <para id="x_347">This updates the working directory so that it contains
	changes from <emphasis>both</emphasis> heads, which is
	reflected in both the output of <command role="hg-cmd">hg
	  parents</command> and the contents of

      of the same files.  Unless both modifications are identical,
      this results in a <emphasis>conflict</emphasis>, where you have
      to decide how to reconcile the different changes into something
      coherent.</para>

    <informalfigure>

      <mediaobject id="fig:tour-merge:conflict">
	<imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
	<textobject><phrase>XXX add text</phrase></textobject>
	<caption><para id="x_34c">Conflicting changes to a
	    document</para></caption>      </mediaobject>
    </informalfigure>

    <para id="x_34d">Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
      an instance of two conflicting changes to a document.  We
      started with a single version of the file; then we made some
      changes; while someone else made different changes to the same

      <para id="x_355">All four of these panes are <emphasis>locked
	  together</emphasis>; if we scroll vertically or horizontally
	in any of them, the others are updated to display the
	corresponding sections of their respective files.</para>

      <informalfigure id="fig:tour-merge:kdiff3">
	<mediaobject><imageobject><imagedata
				    fileref="kdiff3"/></imageobject><textobject><phrase>XXX 
	      add text</phrase></textobject>
	  <caption><para id="x_356">Using <command>kdiff3</command> to merge
	      versions of a file</para></caption>
	</mediaobject>
      </informalfigure>

      <para id="x_357">For each conflicting portion of the file, we can choose to
	resolve the conflict using some combination of text from the
	base version, ours, or theirs.  We can also manually edit the
	merged file at any time, in case we need to make further

690:b788b405e141

      illustrated in figure <xref
	linkend="fig:tour-merge:sep-repos"/>.</para>

    &interaction.tour.merge.cat;

    <figure id="fig:tour-merge:sep-repos">
      <title>Divergent recent histories of the <filename
	  class="directory">my-hello</filename> and <filename
	  class="directory">my-new-hello</filename>
	repositories</title>
      <mediaobject>
	<imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
	<textobject><phrase>XXX add text</phrase></textobject>
      </mediaobject>
    </figure>

    <para id="x_33f">We already know that pulling changes from our <filename
	class="directory">my-hello</filename> repository will have no
      effect on the working directory.</para>

	as they're also known.  The tip revision is thus a head,
	because the newest revision in a repository doesn't have any
	children, but a repository can contain more than one
	head.</para>

      <figure id="fig:tour-merge:pull">
	<title>Repository contents after pulling from <filename
	    class="directory">my-hello</filename> into <filename
	    class="directory">my-new-hello</filename></title>
	<mediaobject>
	  <imageobject>
	    <imagedata fileref="tour-merge-pull"/>
	  </imageobject>
	  <textobject><phrase>XXX add text</phrase></textobject>
	</mediaobject>
      </figure>

      <para id="x_343">In figure <xref linkend="fig:tour-merge:pull"/>, you can
	see the effect of the pull from <filename
	  class="directory">my-hello</filename> into <filename
	  class="directory">my-new-hello</filename>.  The history that

	<command role="hg-cmd">hg merge</command> command to merge the
	two heads.</para>

      &interaction.tour.merge.merge;

      <figure id="fig:tour-merge:merge">
	<title>Working directory and repository during merge, and
	  following commit</title>
	<mediaobject>
	  <imageobject>
	    <imagedata fileref="tour-merge-merge"/>
	  </imageobject>
	  <textobject><phrase>XXX add text</phrase></textobject>
	</mediaobject>
      </figure>

      <para id="x_347">This updates the working directory so that it contains
	changes from <emphasis>both</emphasis> heads, which is
	reflected in both the output of <command role="hg-cmd">hg
	  parents</command> and the contents of

      of the same files.  Unless both modifications are identical,
      this results in a <emphasis>conflict</emphasis>, where you have
      to decide how to reconcile the different changes into something
      coherent.</para>

    <figure id="fig:tour-merge:conflict">
      <title>Conflicting changes to a document</title>
      <mediaobject>
	<imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
	<textobject><phrase>XXX add text</phrase></textobject>
      </mediaobject>
    </figure>

    <para id="x_34d">Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
      an instance of two conflicting changes to a document.  We
      started with a single version of the file; then we made some
      changes; while someone else made different changes to the same

      <para id="x_355">All four of these panes are <emphasis>locked
	  together</emphasis>; if we scroll vertically or horizontally
	in any of them, the others are updated to display the
	corresponding sections of their respective files.</para>

      <figure id="fig:tour-merge:kdiff3">
	<title>Using <command>kdiff3</command> to merge versions of a
	  file</title>
	<mediaobject>
	  <imageobject>
	    <imagedata fileref="kdiff3"/></imageobject>
	  <textobject>
	    <phrase>XXX add text</phrase>
	  </textobject>
	</mediaobject>
      </figure>

      <para id="x_357">For each conflicting portion of the file, we can choose to
	resolve the conflict using some combination of text from the
	base version, ours, or theirs.  We can also manually edit the
	merged file at any time, in case we need to make further