Mercurial > hg
diff tests/test-rebase-conflicts.t @ 51906:0f26ee69cf36
rev-branch-cache: increment the version to "v2"
We want to ensure no older clients will truncate the file under us. So we need to
change their name. We don't change the rest of the format (unfortunaly).
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Sep 2024 03:16:35 +0200 |
parents | c564be351754 |
children | 16efed18ae4e |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Tue Sep 24 00:16:23 2024 +0200 +++ b/tests/test-rebase-conflicts.t Tue Sep 24 03:16:35 2024 +0200 @@ -319,14 +319,14 @@ bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 bundle2-input-bundle: 3 parts total - resetting content of cache/rbc-revs-v1 + resetting content of cache/rbc-revs-v2 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 - resetting content of cache/rbc-revs-v1 + resetting content of cache/rbc-revs-v2 Test minimization of merge conflicts $ hg up -q null