Mercurial > evolve
comparison tests/test-evolve-topic.t @ 4576:96ce1030d2fb
tests: add --update to hg evolve to reduce test changes for the next patch
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 14 Apr 2019 02:18:19 +0800 |
| parents | ef155f624670 |
| children | bcd52ce0916d |
comparison
equal
deleted
inserted
replaced
| 4575:903e8b983fac | 4576:96ce1030d2fb |
|---|---|
| 130 s3$ add eee (orphan) | 130 s3$ add eee (orphan) |
| 131 s2: add ddd | 131 s2: add ddd |
| 132 s1: add ccc | 132 s1: add ccc |
| 133 s0^ add bbb (base) | 133 s0^ add bbb (base) |
| 134 | 134 |
| 135 $ hg evolve --all | 135 $ hg evolve --all --update |
| 136 move:[s3] add eee | 136 move:[s3] add eee |
| 137 atop:[s2] add ddd | 137 atop:[s2] add ddd |
| 138 move:[s4] add fff | 138 move:[s4] add fff |
| 139 working directory is now at 070c5573d8f9 | 139 working directory is now at 070c5573d8f9 |
| 140 $ hg log -G | 140 $ hg log -G |
| 166 | 166 |
| 167 | 167 |
| 168 Test that evolve does not loose topic information | 168 Test that evolve does not loose topic information |
| 169 ------------------------------------------------- | 169 ------------------------------------------------- |
| 170 | 170 |
| 171 $ hg evolve --rev 'topic(bar)' | 171 $ hg evolve --rev 'topic(bar)' --update |
| 172 move:[6] add ggg | 172 move:[6] add ggg |
| 173 atop:[13] add fff | 173 atop:[13] add fff |
| 174 move:[7] add hhh | 174 move:[7] add hhh |
| 175 move:[8] add iii | 175 move:[8] add iii |
| 176 move:[9] add jjj | 176 move:[9] add jjj |