Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-conflicts.t @ 37842:326b174c6a47 stable
bundle2: mark the bundle2 part as advisory (issue5872)
It blocks old clients to read bundle including this part.
Differential Revision: https://phab.mercurial-scm.org/D3481
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Tue, 08 May 2018 14:17:46 -0700 |
| parents | 5d10f41ddcc4 |
| children | 50f5fc232c16 |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Tue May 08 11:39:38 2018 +0200 +++ b/tests/test-rebase-conflicts.t Tue May 08 14:17:46 2018 -0700 @@ -298,7 +298,7 @@ 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 bundle2-output-bundle: "HG20", (1 params) 3 parts total bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload - bundle2-output-part: "cache:rev-branch-cache" streamed payload + bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload bundle2-output-part: "phase-heads" 24 bytes payload saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg 3 changesets found @@ -308,7 +308,7 @@ 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf bundle2-output-bundle: "HG20", 3 parts total bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload - bundle2-output-part: "cache:rev-branch-cache" streamed payload + bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload bundle2-output-part: "phase-heads" 24 bytes payload adding branch bundle2-input-bundle: with-transaction @@ -322,7 +322,7 @@ adding f1.txt revisions added 2 changesets with 2 changes to 1 files bundle2-input-part: total payload size 1686 - bundle2-input-part: "cache:rev-branch-cache" supported + bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: total payload size 74 truncating cache/rbc-revs-v1 to 56 bundle2-input-part: "phase-heads" supported