Mercurial > hg
diff tests/test-rebase-conflicts.t @ 42602:c7d236b55a3e
py3: fix formatting of branchmap log messages with repo.filtername=None
`"%s" % None` does not work on py3. I've extracted a little function
for producing a formatted message given the filter name.
Differential Revision: https://phab.mercurial-scm.org/D6644
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 14 Jul 2019 23:21:28 -0700 |
| parents | 12243f15d53e |
| children | d7304434390f |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Sun Jul 14 01:31:42 2019 -0400 +++ b/tests/test-rebase-conflicts.t Sun Jul 14 23:21:28 2019 -0700 @@ -324,8 +324,8 @@ bundle2-input-part: total payload size 24 bundle2-input-bundle: 2 parts total updating the branch cache - invalid branchheads cache (served): tip differs - invalid branchheads cache (served.hidden): tip differs + invalid branch cache (served): tip differs + invalid branch cache (served.hidden): tip differs rebase completed Test minimization of merge conflicts