Mercurial > evolve
diff tests/test-single-head-obsolescence-topic-B5.t @ 6392:faea18a26188 mercurial-5.9
test-compat: merge mercurial-6.0 into mercurial-5.9
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 06 Feb 2023 18:56:14 +0400 |
parents | caf302fb8f4d |
children | b1d010b2e6c4 9da0114a8a02 |
line wrap: on
line diff
--- a/tests/test-single-head-obsolescence-topic-B5.t Thu Dec 08 19:31:00 2022 +0400 +++ b/tests/test-single-head-obsolescence-topic-B5.t Mon Feb 06 18:56:14 2023 +0400 @@ -88,13 +88,13 @@ | o f6082bc4ffef [default] (draft): A1 | - | * 339fd31549ed [default:topic-Y] (draft): C0 + | * 339fd31549ed [default//topic-Y] (draft): C0 | | - | x 33b3d4185449 [default:topic-X] (draft): M0 + | x 33b3d4185449 [default//topic-X] (draft): M0 | |\ - +---o d3826ff42cf7 [default:topic-X] (draft): B0 + +---o d3826ff42cf7 [default//topic-X] (draft): B0 | | - | o 5a47a98cd8e5 [default:topic-X] (draft): A0 + | o 5a47a98cd8e5 [default//topic-X] (draft): A0 |/ o 1e4be0697311 [default] (public): root @@ -110,6 +110,6 @@ no changes found transaction abort! rollback completed - abort: rejecting multiple heads on branch "default:topic-X" + abort: rejecting multiple heads on branch "default//topic-X" (2 heads: 5a47a98cd8e5 d3826ff42cf7) [255]