Mercurial > evolve
comparison tests/test-topic-rebase.t @ 5722:61d2f1cf90f0
branching: merge stable into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 22 Jan 2021 11:04:55 +0100 |
| parents | e5d91fd1f319 b3d9e6c805d6 |
| children | 8e4f6354b316 a1dad44fe3da |
comparison
equal
deleted
inserted
replaced
| 5705:9f8ff149f258 | 5722:61d2f1cf90f0 |
|---|---|
| 164 $ hg stack | 164 $ hg stack |
| 165 ### topic: myotherfeature | 165 ### topic: myotherfeature |
| 166 ### target: default (branch) | 166 ### target: default (branch) |
| 167 s1@ myotherfeature1 (current) | 167 s1@ myotherfeature1 (current) |
| 168 s0^ default3 (base) | 168 s0^ default3 (base) |
| 169 | |
| 170 inmemory rebase currently drops the topic. | |
| 171 | |
| 172 BUG: inmemory rebase currently drops the topic. This is the correct output | |
| 173 because of there's a config override. | |
| 174 | |
| 175 $ echo x > a.txt | |
| 176 $ hg ci -Aqm x | |
| 177 $ hg rebase -r . -d 3 --config rebase.experimental.inmemory=1 | |
| 178 rebasing 8:1323571d782d tip myotherfeature "x" | |
| 179 switching to topic myfeature | |
| 180 switching to topic myotherfeature | |
| 181 $ logtopic | |
| 182 @ 9:42f2e003a46e77e1b33da4434c2689722b976b73 | |
| 183 | topics: myotherfeature | |
| 184 | o 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 | |
| 185 | | topics: myotherfeature | |
| 186 | o 6:0b124ef641a7a6f4715d962650d3b367e8c800be | |
| 187 | | topics: | |
| 188 | o 4:0cd2e1a45ac4e3f9603a05ccfa6d1c70cd759bc5 | |
| 189 |/ topics: | |
| 190 o 3:fc6593661cf3256ba165cbccd6019ead17cc3726 | |
| 191 | topics: myfeature | |
| 192 o 2:be7622a7a0f43ba713e152f56441275f8e8711ef | |
| 193 | topics: | |
| 194 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 | |
| 195 topics: |