Mercurial > evolve
comparison tests/test-topic-change.t @ 3102:6604d96fc73c mercurial-4.3
test-compat: revert output change in rebase
This backed out changeset d12c82fd1143 and a couple of other changes.
The change are not relevant in Mercurial < 4.4/
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 17:30:20 +0200 |
| parents | f43a310c4338 |
| children | f5d472b7e800 |
comparison
equal
deleted
inserted
replaced
| 3101:7f949debd50d | 3102:6604d96fc73c |
|---|---|
| 178 | | 178 | |
| 179 o 8:86a186070af2 {foo} | 179 o 8:86a186070af2 {foo} |
| 180 Added a () | 180 Added a () |
| 181 | 181 |
| 182 $ hg rebase -s 11 -d 22 | 182 $ hg rebase -s 11 -d 22 |
| 183 rebasing 11:1315a3808ed0 "Added d" (foo) | 183 rebasing 11:1315a3808ed0 "Added d" |
| 184 switching to topic foo | 184 switching to topic foo |
| 185 rebasing 16:edc4a6b9ea60 "Added e" (bar) | 185 rebasing 16:edc4a6b9ea60 "Added e" |
| 186 switching to topic bar | 186 switching to topic bar |
| 187 rebasing 17:82e0b14f4d9e "Added f" (bar) | 187 rebasing 17:82e0b14f4d9e "Added f" |
| 188 rebasing 18:e7b418d79a05 "Added g" (bar) | 188 rebasing 18:e7b418d79a05 "Added g" |
| 189 rebasing 20:c2d6b7df5dcf "Added h" (foobar) | 189 rebasing 20:c2d6b7df5dcf "Added h" |
| 190 switching to topic foobar | 190 switching to topic foobar |
| 191 | 191 |
| 192 $ hg glog | 192 $ hg glog |
| 193 @ 27:a1a9465da59b {foobar} | 193 @ 27:a1a9465da59b {foobar} |
| 194 | Added h () | 194 | Added h () |