Mercurial > evolve
comparison tests/test-evolve-continue.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 | cc2bbe2701a3 |
| children | bcd52ce0916d |
comparison
equal
deleted
inserted
replaced
| 4575:903e8b983fac | 4576:96ce1030d2fb |
|---|---|
| 111 o 1:c7586e2a9264 added a | 111 o 1:c7586e2a9264 added a |
| 112 | () draft | 112 | () draft |
| 113 o 0:8fa14d15e168 added hgignore | 113 o 0:8fa14d15e168 added hgignore |
| 114 () draft | 114 () draft |
| 115 | 115 |
| 116 $ hg evolve | 116 $ hg evolve --update |
| 117 move:[7] added e | 117 move:[7] added e |
| 118 atop:[8] added d | 118 atop:[8] added d |
| 119 merging e | 119 merging e |
| 120 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 120 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 121 fix conflicts and see `hg help evolve.interrupted` | 121 fix conflicts and see `hg help evolve.interrupted` |
| 151 $ echo bar > b | 151 $ echo bar > b |
| 152 $ hg add b | 152 $ hg add b |
| 153 $ hg amend | 153 $ hg amend |
| 154 3 new orphan changesets | 154 3 new orphan changesets |
| 155 | 155 |
| 156 $ hg evolve --all | 156 $ hg evolve --all --update |
| 157 move:[2] added b | 157 move:[2] added b |
| 158 atop:[9] added a | 158 atop:[9] added a |
| 159 merging b | 159 merging b |
| 160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 161 fix conflicts and see `hg help evolve.interrupted` | 161 fix conflicts and see `hg help evolve.interrupted` |
| 234 o 9:53b632d203d8 added a | 234 o 9:53b632d203d8 added a |
| 235 | () draft | 235 | () draft |
| 236 o 0:8fa14d15e168 added hgignore | 236 o 0:8fa14d15e168 added hgignore |
| 237 () draft | 237 () draft |
| 238 | 238 |
| 239 $ hg evolve --all | 239 $ hg evolve --all --update |
| 240 move:[12] added d | 240 move:[12] added d |
| 241 atop:[16] added c | 241 atop:[16] added c |
| 242 move:[13] added f | 242 move:[13] added f |
| 243 merging f | 243 merging f |
| 244 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | 244 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
| 292 $ echo bar > g | 292 $ echo bar > g |
| 293 $ hg add g | 293 $ hg add g |
| 294 $ hg amend | 294 $ hg amend |
| 295 2 new orphan changesets | 295 2 new orphan changesets |
| 296 | 296 |
| 297 $ hg evolve --all --confirm<<EOF | 297 $ hg evolve --all --update --confirm << EOF |
| 298 > y | 298 > y |
| 299 > EOF | 299 > EOF |
| 300 move:[19] added g | 300 move:[19] added g |
| 301 atop:[21] added f | 301 atop:[21] added f |
| 302 perform evolve? [Ny] y | 302 perform evolve? [Ny] y |
| 308 $ echo foo > g | 308 $ echo foo > g |
| 309 $ hg resolve -m | 309 $ hg resolve -m |
| 310 (no more unresolved files) | 310 (no more unresolved files) |
| 311 continue: hg evolve --continue | 311 continue: hg evolve --continue |
| 312 | 312 |
| 313 $ hg evolve --continue<<EOF | 313 $ hg evolve --continue << EOF |
| 314 > y | 314 > y |
| 315 > EOF | 315 > EOF |
| 316 evolving 19:981e615b14ca "added g" | 316 evolving 19:981e615b14ca "added g" |
| 317 move:[20] added h | 317 move:[20] added h |
| 318 atop:[22] added g | 318 atop:[22] added g |