Mercurial > evolve
comparison tests/test-topic-change.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | d5adce52cef4 1bc4b0807c37 |
| children | 537fd9a86c06 a2fdbece7ce1 |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 146 | | 146 | |
| 147 | 147 |
| 148 Changing topic in between the stack | 148 Changing topic in between the stack |
| 149 | 149 |
| 150 $ hg topic -r 9::10 --current | 150 $ hg topic -r 9::10 --current |
| 151 5 new orphan changesets | |
| 152 changed topic on 2 changes | 151 changed topic on 2 changes |
| 153 $ hg glog | 152 $ hg glog |
| 154 o 22:1b88140feefe {foobar} | 153 o 22:1b88140feefe {foobar} |
| 155 | Added c () | 154 | Added c () |
| 156 | | 155 | |
| 158 | Added b () | 157 | Added b () |
| 159 | | 158 | |
| 160 | @ 20:c2d6b7df5dcf {foobar} | 159 | @ 20:c2d6b7df5dcf {foobar} |
| 161 | | Added h () | 160 | | Added h () |
| 162 | | | 161 | | |
| 163 | * 18:e7b418d79a05 {bar} | 162 | o 18:e7b418d79a05 {bar} |
| 164 | | Added g () | 163 | | Added g () |
| 165 | | | 164 | | |
| 166 | * 17:82e0b14f4d9e {bar} | 165 | o 17:82e0b14f4d9e {bar} |
| 167 | | Added f () | 166 | | Added f () |
| 168 | | | 167 | | |
| 169 | * 16:edc4a6b9ea60 {bar} | 168 | o 16:edc4a6b9ea60 {bar} |
| 170 | | Added e () | 169 | | Added e () |
| 171 | | | 170 | | |
| 172 | * 11:1315a3808ed0 {foo} | 171 | o 11:1315a3808ed0 {foo} |
| 173 | | Added d () | 172 | | Added d () |
| 174 | | | 173 | | |
| 175 | x 10:1fa891977a22 {foo} | 174 | x 10:1fa891977a22 {foo} |
| 176 | | Added c () | 175 | | Added c () |
| 177 | | | 176 | | |
| 373 $ hg phase -r . | 372 $ hg phase -r . |
| 374 26: secret | 373 26: secret |
| 375 | 374 |
| 376 $ hg topic -r . watwat | 375 $ hg topic -r . watwat |
| 377 switching to topic watwat | 376 switching to topic watwat |
| 378 1 new orphan changesets | |
| 379 changed topic on 1 changes | 377 changed topic on 1 changes |
| 380 | 378 |
| 381 $ hg glog | 379 $ hg glog |
| 382 @ 33:894983f69e69 {watwat} | 380 @ 33:894983f69e69 {watwat} |
| 383 | Added g () | 381 | Added g () |
| 384 | | 382 | |
| 385 | * 32:1b83d11095b9 {movebook} | 383 | o 32:1b83d11095b9 {movebook} |
| 386 | | Added h (book bookboo) | 384 | | Added h (book bookboo) |
| 387 | | | 385 | | |
| 388 | x 26:7c76c271395f {bar} | 386 | x 26:7c76c271395f {bar} |
| 389 |/ Added g () | 387 |/ Added g () |
| 390 | | 388 | |