comparison en/ch11-mq.xml @ 811:a66f6d499afa

Add paragraph IDs

810:1a0a78e197c3

  </sect1>

  <sect1>
    <title>More on patch management</title>

    <para>As you grow familiar with MQ, you will find yourself wanting
      to perform other kinds of patch management operations.</para>

    <sect2>
      <title>Deleting unwanted patches</title>

      <para>If you want to get rid of a patch, use the <command
	  role="hg-ext-mq">hg qdelete</command> command to delete the
	patch file and remove its entry from the patch series.  If you
	try to delete a patch that is still applied, <command
	  role="hg-ext-mq">hg qdelete</command> will refuse.</para>

    </sect2>

    <sect2>
      <title>Converting to and from permanent revisions</title>

      <para>Once you're done working on a patch and want to turn it
	into a permanent changeset, use the <command
	  role="hg-ext-mq">hg qdelete -r</command> command.  Pass a
	revision to the <option>-r</option> option to identify the
	patch that you want to turn into a regular changeset; this
	patch must already be applied.</para>

      &interaction.ch11-qdelete.convert;

      <para>It is also possible to turn an existing changeset into a
	patch, by passing the <option>-r</option> option to <command
	  role="hg-ext-mq">hg qimport</command>.</para>

      &interaction.ch11-qdelete.import;

      <para>Note that it only makes sense to convert a changeset into
	a patch if you have not propagated that changeset into any
	other repositories.  The imported changeset's ID will change
	every time you refresh the patch, which will make Mercurial
	treat it as unrelated to the original changeset if you have
	pushed it somewhere else.</para>

811:a66f6d499afa

  </sect1>

  <sect1>
    <title>More on patch management</title>

    <para id="x_6db">As you grow familiar with MQ, you will find yourself wanting
      to perform other kinds of patch management operations.</para>

    <sect2>
      <title>Deleting unwanted patches</title>

      <para id="x_6dc">If you want to get rid of a patch, use the <command
	  role="hg-ext-mq">hg qdelete</command> command to delete the
	patch file and remove its entry from the patch series.  If you
	try to delete a patch that is still applied, <command
	  role="hg-ext-mq">hg qdelete</command> will refuse.</para>

    </sect2>

    <sect2>
      <title>Converting to and from permanent revisions</title>

      <para id="x_6dd">Once you're done working on a patch and want to turn it
	into a permanent changeset, use the <command
	  role="hg-ext-mq">hg qdelete -r</command> command.  Pass a
	revision to the <option>-r</option> option to identify the
	patch that you want to turn into a regular changeset; this
	patch must already be applied.</para>

      &interaction.ch11-qdelete.convert;

      <para id="x_6de">It is also possible to turn an existing changeset into a
	patch, by passing the <option>-r</option> option to <command
	  role="hg-ext-mq">hg qimport</command>.</para>

      &interaction.ch11-qdelete.import;

      <para id="x_6df">Note that it only makes sense to convert a changeset into
	a patch if you have not propagated that changeset into any
	other repositories.  The imported changeset's ID will change
	every time you refresh the patch, which will make Mercurial
	treat it as unrelated to the original changeset if you have
	pushed it somewhere else.</para>