From c1ced74dcac2701fd0900231b329013f97cefbef Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Thu, 19 May 2016 15:32:44 +0000
Subject: [PATCH] mercurial-3.8.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17378 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/prog/mercurial.xml         | 28 ++++++++++++++++------------
 introduction/welcome/changelog.xml | 11 +++++++++++
 packages.ent                       |  2 +-
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/general.ent b/general.ent
index aa0fb04361..c698708ce7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "18">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 18th &year;">
+<!ENTITY releasedate  "May 19th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/general/prog/mercurial.xml b/general/prog/mercurial.xml
index fc8c78b989..deeae90419 100644
--- a/general/prog/mercurial.xml
+++ b/general/prog/mercurial.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "172a8c588adca12308c2aca16608d7f4">
-  <!ENTITY mercurial-size          "4.5 MB">
+  <!ENTITY mercurial-md5sum        "c38daa0cbe264fc621dc3bb05933b0b3">
+  <!ENTITY mercurial-size          "4.6 MB">
   <!ENTITY mercurial-buildsize     "52 MB (385 MB with docs and tests)">
   <!ENTITY mercurial-time          "less than 0.1 SBU (15 SBU with docs and tests)">
 ]>
@@ -98,6 +98,7 @@
 
 <screen><userinput>make doc</userinput></screen>
 
+<!-- All tests pass (or are skipped) at version 3.8.2
     <para>Running the test suite is optional. Tests which fail may be disabled,
     adding each one to <filename>tests/blacklists/failed-tests</filename>. In
     order to execute the test suite using the temporary directory <filename
@@ -108,39 +109,42 @@
 <literal># Test Failures
   test-gpg.t</literal>
 EOF
-
-rm -rf tests/tmp &amp;&amp;
+-->
+    <para>
+      To run the test suite, issue:
+    </para>
+<screen><userinput>rm -rf tests/tmp &amp;&amp;
 
 TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/failed-tests" \
 make check</userinput></screen>
 
     <para>where <replaceable>&lt;N&gt;</replaceable> is an integer between one
-    and the number of ( processor X threads ), inclusive. In order to
+    and the number of ( processor X threads ), inclusive. <!-- In order to
     investigate the apparently failing tests, you may use the
     <command>run-tests.py</command> script. To see the almost forty switches,
-    some of them very useful, issue <command>tests/run-tests.py --help</command>.
+    some of them very useful, issue <command>tests/run-tests.py - -help</command>.
     Running the following commands, you will execute only the tests that failed
-    before:</para>
-
+    before:--></para>
+<!--
 <screen><userinput>pushd tests  &amp;&amp;
   rm -rf tmp &amp;&amp;
 
-  ./run-tests.py --tmpdir tmp test-gpg.t &amp;&amp;
+  ./run-tests.py - -tmpdir tmp test-gpg.t &amp;&amp;
 popd</userinput></screen>
 
     <para>Normally, the previous failures will be confirmed. However, if
     you add the switch
-    "--debug" before "--tmpdir", and run again, some failures are gone, which
+    "- -debug" before "- -tmpdir", and run again, some failures are gone, which
     seems to be a problem with the test suite. If this happens, normally, from
     now on, there will be no more such failures whether you use the debug switch
     or not.</para>
 
-    <para>An interesting switch is "--time", which will generate at the end of
+    <para>An interesting switch is "- -time", which will generate at the end of
     the test suite execution, a table with all executed tests and respective
     start, end, user, system and real times. Notice that the switches may be
     used with <command>make check</command>, including them in the
     <envar>TESTFLAGS</envar> environment variable.</para>
-
+-->
     <para>Install <application>Mercurial</application> by running the following
     command (as <systemitem class="username">root</systemitem>):</para>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 31e8f69111..51f971fd49 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,17 @@
     </listitem>
 
 -->
+
+    <listitem>
+      <para>May 19th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to mercurial-3.8.2.  Fixes
+          <ulink url="&blfs-ticket-root;7855">#7855</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 18th, 2016</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 373c465777..b2bfe36858 100644
--- a/packages.ent
+++ b/packages.ent
@@ -273,7 +273,7 @@
 <!ENTITY librep-version               "0.92.5">
 <!ENTITY llvm-version                 "3.8.0">
 <!ENTITY lua-version                  "5.3.2">
-<!ENTITY mercurial-version            "3.8.1">
+<!ENTITY mercurial-version            "3.8.2">
 <!ENTITY nasm-version                 "2.12.01">
 <!ENTITY npapi-sdk-version            "0.27.2">
 <!ENTITY php-version                  "7.0.6">