Valentin Gatien-Baron <vgatien-baron@janestreet.com> [Fri, 10 Sep 2021 14:37:03 -0400] rev 47875
narrow: show repo corruption when commiting empty files
Differential Revision: https://phab.mercurial-scm.org/D11399
Kyle Lippincott <spectral@google.com> [Tue, 07 Sep 2021 11:50:12 -0700] rev 47874
filemerge: be more strict when detecting conflict markers, add `|` markers
I received a user complaint about detecting a line that contained 78 `=`
followed by `*/` as a conflict marker. We'll never generate that, we generate 7
identical characters and either the end of the line, or a space. Let's be
explicit about detecting exactly what we produce to reduce the chances of a
false positive.
While we're here, add `|||||||` as a detected conflict marker (generated with
the `keep-merge3` style conflicts).
Differential Revision: https://phab.mercurial-scm.org/D11391
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 30 Aug 2021 23:40:43 +0530] rev 47873
Added signature for changeset 86a60679cf61
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 30 Aug 2021 23:40:37 +0530] rev 47872
Added tag 5.9.1 for changeset 86a60679cf61
Martin von Zweigbergk <martinvonz@google.com> [Fri, 27 Aug 2021 13:51:44 -0700] rev 47871
fix: again allow formatting the working copy while merging
I forgot about unfinished merges (I think I was thinking only about
unfinished merge conflicts) when I wrote
https://phab.mercurial-scm.org/D11209. As a coworker (hg contributor
dploch) reported to me, this led to `hg fix --working-dir` failing
when you have an uncommitted merge. The fix is trivial: just move the
assertion to just before the call to `scmutil.movedirstate()` where it
actually matters.
Differential Revision: https://phab.mercurial-scm.org/D11376
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 26 Aug 2021 21:40:21 -0700] rev 47870
pyoxidizer: add arch to PyOxidizer MSIs
This is the proper filename pattern. This filename format
wasn't properly implemented when PyOxidizer took over Python 3
MSI generation in 603efb3845ba.
Differential Revision: https://phab.mercurial-scm.org/D11359