Mercurial > evolve
comparison tests/test-topic-stack-complex.t @ 5647:c2fab88e6d60
tests: rebase now produces different "one-line summary" output
CORE-TEST-OUTPUT-UPDATE: e9555305c5c6
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 29 Oct 2020 09:19:37 -0700 |
| parents | a73cdef2e33f |
| children | 03410b04cf10 |
comparison
equal
deleted
inserted
replaced
| 5646:4c1eb455259f | 5647:c2fab88e6d60 |
|---|---|
| 158 (use 'hg evolve' to update to its successor: ec94a1ed1330) | 158 (use 'hg evolve' to update to its successor: ec94a1ed1330) |
| 159 $ hg amend -d '0 1' | 159 $ hg amend -d '0 1' |
| 160 1 new orphan changesets | 160 1 new orphan changesets |
| 161 2 new content-divergent changesets | 161 2 new content-divergent changesets |
| 162 $ hg rebase -r . -d ec94a1ed1330~1 | 162 $ hg rebase -r . -d ec94a1ed1330~1 |
| 163 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) | 163 rebasing 9:eb3b16fef8ea tip foo "Added e and f" |
| 164 $ hg stack | 164 $ hg stack |
| 165 ### topic: foo (2 heads) | 165 ### topic: foo (2 heads) |
| 166 ### target: default (branch) | 166 ### target: default (branch) |
| 167 s5$ Added e and f (content divergent) | 167 s5$ Added e and f (content divergent) |
| 168 s3^ split2 (base) | 168 s3^ split2 (base) |