Commit 84771a09 authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

branching: merge stable into default

Pipeline #23352 passed with stage
in 7 minutes and 36 seconds
......@@ -117,9 +117,9 @@ release. Since 9.3.0, evolve has official support for Python 3.6+.
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`_).
......
......@@ -206,7 +206,7 @@ def _solvephasedivergence(ui, repo, bumped, evolvestate, display,
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:
......
......@@ -30,8 +30,8 @@ Archiving to a separate location to avoid hardlink mess when the repo is shared
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
......
......@@ -182,13 +182,13 @@ in conflicts
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
......
......@@ -194,7 +194,7 @@ testing the --dry-run option
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.
......
......@@ -168,7 +168,7 @@ Stabilize!
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment