# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1624252795 -7200
# Node ID 9b507e5e67446233252f121a59b4c6d648d40c8f
# Parent  fb90474ec53f2951585ebc8e264eb2d6455e8bcd# Parent  254e135b46ef2e2cf5548bc76eb860b17c2b6b0d
branching: merge stable into default

diff -r fb90474ec53f -r 9b507e5e6744 README.rst
--- a/README.rst	Sat Jun 05 00:34:53 2021 +0800
+++ b/README.rst	Mon Jun 21 07:19:55 2021 +0200
@@ -117,9 +117,9 @@
 How to Contribute
 =================
 
-Discussion happens on the #hg-evolve IRC on freenode_.
+Discussion happens on the #hg-evolve IRC on libera_.
 
-.. _freenode: https://freenode.net/
+.. _libera: https://libera.chat/
 
 Bugs are to be reported on the Mercurial's bug tracker (component:
 `evolution`_).
diff -r fb90474ec53f -r 9b507e5e6744 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Sat Jun 05 00:34:53 2021 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Jun 21 07:19:55 2021 +0200
@@ -206,7 +206,7 @@
         repo.ui.write(todo)
         repo.ui.write((b'hg update %s;\n' % prec))
         repo.ui.write((b'hg revert --all --rev %s;\n' % bumped))
-        repo.ui.write((b'hg commit --msg "%s update to %s"\n' %
+        repo.ui.write((b'hg commit --message "%s update to %s"\n' %
                        (TROUBLES['PHASEDIVERGENT'], bumped)))
         return (False, b".")
     if progresscb:
diff -r fb90474ec53f -r 9b507e5e6744 tests/test-check-sdist.t
--- a/tests/test-check-sdist.t	Sat Jun 05 00:34:53 2021 +0800
+++ b/tests/test-check-sdist.t	Mon Jun 21 07:19:55 2021 +0200
@@ -30,8 +30,8 @@
   no previously-included directories found matching '.gitlab'
   $ cd "$TESTTMP"/dist
 
-  $ wc -c hg-evolve-*.tar.gz
-  8????? hg-evolve-*.tar.gz (glob)
+  $ find hg-evolve-*.tar.gz -size +800000c
+  hg-evolve-*.tar.gz (glob)
 
   $ tar -tzf hg-evolve-*.tar.gz | sed 's|^hg-evolve-[^/]*/||' | sort > files
   $ wc -l files
diff -r fb90474ec53f -r 9b507e5e6744 tests/test-evolve-abort-phasediv.t
--- a/tests/test-evolve-abort-phasediv.t	Sat Jun 05 00:34:53 2021 +0800
+++ b/tests/test-evolve-abort-phasediv.t	Mon Jun 21 07:19:55 2021 +0200
@@ -182,13 +182,13 @@
   hg rebase --rev e44ebefe4f54 --dest ca1b80f7960a;
   hg update c41c793e0ef1;
   hg revert --all --rev e44ebefe4f54;
-  hg commit --msg "phase-divergent update to e44ebefe4f54"
+  hg commit --message "phase-divergent update to e44ebefe4f54"
   recreate:[9] added c
   atop:[3] added c
   hg rebase --rev 28cd06b3f801 --dest b1661037fa25;
   hg update ca1b80f7960a;
   hg revert --all --rev 28cd06b3f801;
-  hg commit --msg "phase-divergent update to 28cd06b3f801"
+  hg commit --message "phase-divergent update to 28cd06b3f801"
 
   $ hg glog --hidden
   @  9:28cd06b3f801 added c
diff -r fb90474ec53f -r 9b507e5e6744 tests/test-evolve-phase-divergence.t
--- a/tests/test-evolve-phase-divergence.t	Sat Jun 05 00:34:53 2021 +0800
+++ b/tests/test-evolve-phase-divergence.t	Mon Jun 21 07:19:55 2021 +0200
@@ -194,7 +194,7 @@
   hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e;
   hg update 4d1169d82e47;
   hg revert --all --rev 98bb3a6cfe1a;
-  hg commit --msg "phase-divergent update to 98bb3a6cfe1a"
+  hg commit --message "phase-divergent update to 98bb3a6cfe1a"
 
 XXX: evolve should have mentioned that draft commit is just obsoleted in favour
 of public one. From the message it looks like a new commit is created.
diff -r fb90474ec53f -r 9b507e5e6744 tests/test-unstability-resolution-result.t
--- a/tests/test-unstability-resolution-result.t	Sat Jun 05 00:34:53 2021 +0800
+++ b/tests/test-unstability-resolution-result.t	Mon Jun 21 07:19:55 2021 +0200
@@ -168,7 +168,7 @@
   hg rebase --rev 99c21c89bcef --dest 66719795a494;
   hg update 1cf0aacfd363;
   hg revert --all --rev 99c21c89bcef;
-  hg commit --msg "phase-divergent update to 99c21c89bcef"
+  hg commit --message "phase-divergent update to 99c21c89bcef"
   $ hg evolve --any --confirm --phase-divergent
   recreate:[9] newer a
   atop:[6] newer a