Mercurial > evolve
diff tests/test-evolve-public-content-divergent-discard.t @ 6878:2fbe91d762ef
topic: use FQBN for displaying topic name when it becomes empty
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 26 Oct 2023 15:30:19 -0300 |
| parents | 7a9d3fde811f |
| children | 9da0114a8a02 |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-discard.t Thu Sep 26 17:09:11 2024 +0400 +++ b/tests/test-evolve-public-content-divergent-discard.t Thu Oct 26 15:30:19 2023 -0300 @@ -669,7 +669,7 @@ (publish one side) $ hg phase --public - active topic 'topic-1' is now empty + active topic 'double//slash//tns-1/topic-1' is now empty (use 'hg topic --clear' to clear it if needed) $ hg up -r "draft()" clearing empty topic "topic-1" @@ -711,6 +711,6 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved other divergent changeset 638eff2d31b7 is a closed branch head and differs from local bde8ac1c636a by "branch, description" only, discarding 638eff2d31b7 content divergence resolution between bde8ac1c636a (public) and 638eff2d31b7 has same content as bde8ac1c636a, discarding 638eff2d31b7 - active topic 'topic-2' is now empty + active topic '//tns-2/topic-2' is now empty working directory is now at bde8ac1c636a