Mercurial > evolve
comparison tests/test-topic-stack-complex.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | 03410b04cf10 |
| children | c2c85576ddfb |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 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 tip foo "Added e and f" | 163 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) |
| 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) |