Mercurial > evolve
comparison tests/test-topic-change.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 | c0921b5277a0 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 180 | | 180 | |
| 181 o 8:86a186070af2 {foo} | 181 o 8:86a186070af2 {foo} |
| 182 Added a () | 182 Added a () |
| 183 | 183 |
| 184 $ hg rebase -s 11 -d 22 | 184 $ hg rebase -s 11 -d 22 |
| 185 rebasing 11:1315a3808ed0 foo "Added d" | 185 rebasing 11:1315a3808ed0 "Added d" (foo) |
| 186 switching to topic foo | 186 switching to topic foo |
| 187 rebasing 16:edc4a6b9ea60 bar "Added e" | 187 rebasing 16:edc4a6b9ea60 "Added e" (bar) |
| 188 switching to topic bar | 188 switching to topic bar |
| 189 rebasing 17:82e0b14f4d9e bar "Added f" | 189 rebasing 17:82e0b14f4d9e "Added f" (bar) |
| 190 rebasing 18:e7b418d79a05 bar "Added g" | 190 rebasing 18:e7b418d79a05 "Added g" (bar) |
| 191 rebasing 20:c2d6b7df5dcf foobar "Added h" | 191 rebasing 20:c2d6b7df5dcf "Added h" (foobar) |
| 192 switching to topic foobar | 192 switching to topic foobar |
| 193 | 193 |
| 194 $ hg glog | 194 $ hg glog |
| 195 @ 27:a1a9465da59b {foobar} | 195 @ 27:a1a9465da59b {foobar} |
| 196 | Added h () | 196 | Added h () |