Martin von Zweigbergk <martinvonz@google.com> [Thu, 29 Oct 2020 00:17:12 -0700] rev 45817
branching: merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 17 Oct 2020 21:57:21 +0900] rev 45816
help: update command synopsis to clarify "cp --forget" only takes destinations
I'm a bit confused while reading 03690079d7dd, which says "a destination
file", but the code loops over matched files.
Matt Harbison <matt_harbison@yahoo.com> [Tue, 13 Oct 2020 14:16:21 -0400] rev 45815
rebase: update commit hash references in the new commits
This excludes the --collapse case because degenerating to p1 is almost certainly
as wrong as leaving the old hashes in place. I expect most people to amend the
message explicitly when using that.
Differential Revision: https://phab.mercurial-scm.org/D9229
Martin von Zweigbergk <martinvonz@google.com> [Thu, 22 Oct 2020 23:35:04 -0700] rev 45814
histedit: drop fallback to empty string from rendertemplate()
AFAICT, `cmdutil.rendertemplate()` always returns bytes (never
e.g. `None`), so we don't need to fall back to empty
(byte-)string. The fallback has been there since the code was added in
11c076786d56 (histedit: add templating support to histedit's rule file
generation, 2019-01-29).
Differential Revision: https://phab.mercurial-scm.org/D9244