tests/test-rebase-conflicts.t
branchstable
changeset 37842 326b174c6a47
parent 37336 5d10f41ddcc4
child 38341 50f5fc232c16
equal deleted inserted replaced
37841:d618558e4e8b 37842:326b174c6a47
   296   list of changesets:
   296   list of changesets:
   297   e31216eec445e44352c5f01588856059466a24c9
   297   e31216eec445e44352c5f01588856059466a24c9
   298   2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
   298   2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
   299   bundle2-output-bundle: "HG20", (1 params) 3 parts total
   299   bundle2-output-bundle: "HG20", (1 params) 3 parts total
   300   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   300   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   301   bundle2-output-part: "cache:rev-branch-cache" streamed payload
   301   bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
   302   bundle2-output-part: "phase-heads" 24 bytes payload
   302   bundle2-output-part: "phase-heads" 24 bytes payload
   303   saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg
   303   saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg
   304   3 changesets found
   304   3 changesets found
   305   list of changesets:
   305   list of changesets:
   306   4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
   306   4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
   307   19c888675e133ab5dff84516926a65672eaf04d9
   307   19c888675e133ab5dff84516926a65672eaf04d9
   308   2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
   308   2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
   309   bundle2-output-bundle: "HG20", 3 parts total
   309   bundle2-output-bundle: "HG20", 3 parts total
   310   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   310   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   311   bundle2-output-part: "cache:rev-branch-cache" streamed payload
   311   bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
   312   bundle2-output-part: "phase-heads" 24 bytes payload
   312   bundle2-output-part: "phase-heads" 24 bytes payload
   313   adding branch
   313   adding branch
   314   bundle2-input-bundle: with-transaction
   314   bundle2-input-bundle: with-transaction
   315   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   315   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   316   adding changesets
   316   adding changesets
   320   adding manifests
   320   adding manifests
   321   adding file changes
   321   adding file changes
   322   adding f1.txt revisions
   322   adding f1.txt revisions
   323   added 2 changesets with 2 changes to 1 files
   323   added 2 changesets with 2 changes to 1 files
   324   bundle2-input-part: total payload size 1686
   324   bundle2-input-part: total payload size 1686
   325   bundle2-input-part: "cache:rev-branch-cache" supported
   325   bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
   326   bundle2-input-part: total payload size 74
   326   bundle2-input-part: total payload size 74
   327   truncating cache/rbc-revs-v1 to 56
   327   truncating cache/rbc-revs-v1 to 56
   328   bundle2-input-part: "phase-heads" supported
   328   bundle2-input-part: "phase-heads" supported
   329   bundle2-input-part: total payload size 24
   329   bundle2-input-part: total payload size 24
   330   bundle2-input-bundle: 2 parts total
   330   bundle2-input-bundle: 2 parts total