diff mercurial/simplemerge.py @ 47786:48da5c325750 stable

rewriteutil: fix crash when a rewritten message references f{6,64} Without this, the rewriteutil logic thinks it's found a reference to the wdir pseudo-revision, and then tries to look it up and rewrite it. Stop it from doing that. Amusingly, I had trouble working with this changeset when I didn't describe the defect above using a regular expression, because it would trigger the bug in my installed version of hg. Differential Revision: https://phab.mercurial-scm.org/D11232
author Augie Fackler <augie@google.com>
date Thu, 29 Jul 2021 16:23:45 -0400
parents 728d89f6f9b1
children 9e1f174d305b
line wrap: on
line diff