tests/test-rebase-conflicts.t
changeset 29593 953839de96ab
parent 28072 c3e9269d9602
child 29615 a2a380e2750f
equal deleted inserted replaced
29592:37cccad55410 29593:953839de96ab
   277   2 changesets found
   277   2 changesets found
   278   list of changesets:
   278   list of changesets:
   279   e31216eec445e44352c5f01588856059466a24c9
   279   e31216eec445e44352c5f01588856059466a24c9
   280   2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
   280   2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
   281   bundle2-output-bundle: "HG20", (1 params) 1 parts total
   281   bundle2-output-bundle: "HG20", (1 params) 1 parts total
   282   bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
   282   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   283   saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
   283   saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
   284   3 changesets found
   284   3 changesets found
   285   list of changesets:
   285   list of changesets:
   286   4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
   286   4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
   287   19c888675e133ab5dff84516926a65672eaf04d9
   287   19c888675e133ab5dff84516926a65672eaf04d9
   288   2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
   288   2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
   289   bundle2-output-bundle: "HG20", 1 parts total
   289   bundle2-output-bundle: "HG20", 1 parts total
   290   bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
   290   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   291   adding branch
   291   adding branch
   292   bundle2-input-bundle: with-transaction
   292   bundle2-input-bundle: with-transaction
   293   bundle2-input-part: "changegroup" (params: 1 mandatory) supported
   293   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   294   adding changesets
   294   adding changesets
   295   add changeset 4c9fbe56a16f
   295   add changeset 4c9fbe56a16f
   296   add changeset 19c888675e13
   296   add changeset 19c888675e13
   297   add changeset 2a7f09cac94c
   297   add changeset 2a7f09cac94c
   298   adding manifests
   298   adding manifests