Mercurial > evolve
comparison tests/test-evolve-stop-orphan.t @ 6066:34f5c849fc1d mercurial-5.5
test-compat: merge mercurial-5.6 into mercurial-5.5
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 11:53:21 +0300 |
| parents | 9b1bdd68d545 c0921b5277a0 |
| children | 6b67f26f4667 e5bd76f95145 |
comparison
equal
deleted
inserted
replaced
| 6065:c0921b5277a0 | 6066:34f5c849fc1d |
|---|---|
| 13 | 13 |
| 14 $ cat >> $HGRCPATH <<EOF | 14 $ cat >> $HGRCPATH <<EOF |
| 15 > [extensions] | 15 > [extensions] |
| 16 > evolve = | 16 > evolve = |
| 17 > EOF | 17 > EOF |
| 18 | |
| 19 #testcases inmemory ondisk | |
| 20 #if inmemory | |
| 21 $ cat >> $HGRCPATH <<EOF | |
| 22 > [experimental] | |
| 23 > evolution.in-memory = yes | |
| 24 > EOF | |
| 25 #endif | |
| 26 | 18 |
| 27 $ hg init stoprepo | 19 $ hg init stoprepo |
| 28 $ cd stoprepo | 20 $ cd stoprepo |
| 29 $ echo ".*\.orig" > .hgignore | 21 $ echo ".*\.orig" > .hgignore |
| 30 $ hg add .hgignore | 22 $ hg add .hgignore |
| 94 () draft | 86 () draft |
| 95 | 87 |
| 96 $ hg evolve | 88 $ hg evolve |
| 97 move:[4] added d | 89 move:[4] added d |
| 98 atop:[5] added c | 90 atop:[5] added c |
| 99 merging d (inmemory !) | |
| 100 hit merge conflicts; retrying merge in working copy (inmemory !) | |
| 101 merging d | 91 merging d |
| 102 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 103 unresolved merge conflicts | 93 unresolved merge conflicts |
| 104 (see 'hg help evolve.interrupted') | 94 (see 'hg help evolve.interrupted') |
| 105 [1] | 95 [1] |
| 142 ======================================================================== | 132 ======================================================================== |
| 143 | 133 |
| 144 $ hg next --evolve | 134 $ hg next --evolve |
| 145 move:[4] added d | 135 move:[4] added d |
| 146 atop:[5] added c | 136 atop:[5] added c |
| 147 merging d (inmemory !) | |
| 148 hit merge conflicts; retrying merge in working copy (inmemory !) | |
| 149 merging d | 137 merging d |
| 150 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 151 unresolved merge conflicts | 139 unresolved merge conflicts |
| 152 (see 'hg help evolve.interrupted') | 140 (see 'hg help evolve.interrupted') |
| 153 [1] | 141 [1] |
| 205 -------------------------------------------------------------------------------- | 193 -------------------------------------------------------------------------------- |
| 206 | 194 |
| 207 $ hg evolve --update | 195 $ hg evolve --update |
| 208 move:[4] added d | 196 move:[4] added d |
| 209 atop:[5] added c | 197 atop:[5] added c |
| 210 merging d (inmemory !) | |
| 211 hit merge conflicts; retrying merge in working copy (inmemory !) | |
| 212 merging d | 198 merging d |
| 213 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 199 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 214 unresolved merge conflicts | 200 unresolved merge conflicts |
| 215 (see 'hg help evolve.interrupted') | 201 (see 'hg help evolve.interrupted') |
| 216 [1] | 202 [1] |
| 257 $ hg evolve --all | 243 $ hg evolve --all |
| 258 move:[1] added a | 244 move:[1] added a |
| 259 atop:[7] added hgignore | 245 atop:[7] added hgignore |
| 260 move:[2] added b | 246 move:[2] added b |
| 261 move:[5] added c | 247 move:[5] added c |
| 262 merging c (inmemory !) | |
| 263 hit merge conflicts; retrying merge in working copy (inmemory !) | |
| 264 merging c | 248 merging c |
| 265 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 249 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 266 unresolved merge conflicts | 250 unresolved merge conflicts |
| 267 (see 'hg help evolve.interrupted') | 251 (see 'hg help evolve.interrupted') |
| 268 [1] | 252 [1] |
| 297 Making sure doing evolve again resumes from right place and does the right thing | 281 Making sure doing evolve again resumes from right place and does the right thing |
| 298 | 282 |
| 299 $ hg evolve --all | 283 $ hg evolve --all |
| 300 move:[5] added c | 284 move:[5] added c |
| 301 atop:[9] added b | 285 atop:[9] added b |
| 302 merging c (inmemory !) | |
| 303 hit merge conflicts; retrying merge in working copy (inmemory !) | |
| 304 merging c | 286 merging c |
| 305 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 287 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 306 unresolved merge conflicts | 288 unresolved merge conflicts |
| 307 (see 'hg help evolve.interrupted') | 289 (see 'hg help evolve.interrupted') |
| 308 [1] | 290 [1] |
| 374 | 356 |
| 375 $ hg evolve --all | 357 $ hg evolve --all |
| 376 move:[9] added b | 358 move:[9] added b |
| 377 atop:[12] added a | 359 atop:[12] added a |
| 378 move:[10] added c | 360 move:[10] added c |
| 379 merging c (inmemory !) | |
| 380 hit merge conflicts; retrying merge in working copy (inmemory !) | |
| 381 merging c | 361 merging c |
| 382 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 362 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 383 unresolved merge conflicts | 363 unresolved merge conflicts |
| 384 (see 'hg help evolve.interrupted') | 364 (see 'hg help evolve.interrupted') |
| 385 [1] | 365 [1] |