Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-conflicts.t @ 51899:9f7cf869e9f4
rev-branch-cache: add a way to force rewrite of the cache
This seems useful to be able to do this, for example during strip.
This align with the intended expressed in the `test-branches.t` test. This will
help use being more confident about future changes in the series.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 23 Sep 2024 23:52:45 +0200 |
| parents | f95ab2c53303 |
| children | c564be351754 |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Tue Sep 24 00:01:30 2024 +0200 +++ b/tests/test-rebase-conflicts.t Mon Sep 23 23:52:45 2024 +0200 @@ -319,12 +319,14 @@ bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 bundle2-input-bundle: 3 parts total - truncating cache/rbc-revs-v1 to 72 + truncating cache/rbc-revs-v1 to 0 added 2 changesets with 2 changes to 1 files updating the branch cache invalid branch cache (served): tip differs + history modification detected - truncating revision branch cache to revision 1 invalid branch cache (served.hidden): tip differs rebase completed + truncating cache/rbc-revs-v1 to 8 Test minimization of merge conflicts $ hg up -q null