Mercurial > evolve
comparison tests/test-evolve-stop-orphan.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | fd039a7f0c3c |
| children | 9b1bdd68d545 c0921b5277a0 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 100 hit merge conflicts; retrying merge in working copy (inmemory !) | 100 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 101 merging d | 101 merging d |
| 102 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 102 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 103 unresolved merge conflicts | 103 unresolved merge conflicts |
| 104 (see 'hg help evolve.interrupted') | 104 (see 'hg help evolve.interrupted') |
| 105 [240] | 105 [1] |
| 106 | 106 |
| 107 $ hg evolve --stop | 107 $ hg evolve --stop |
| 108 stopped the interrupted evolve | 108 stopped the interrupted evolve |
| 109 working directory is now at cb6a2ab625bb | 109 working directory is now at cb6a2ab625bb |
| 110 | 110 |
| 148 hit merge conflicts; retrying merge in working copy (inmemory !) | 148 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 149 merging d | 149 merging d |
| 150 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 150 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 151 unresolved merge conflicts | 151 unresolved merge conflicts |
| 152 (see 'hg help evolve.interrupted') | 152 (see 'hg help evolve.interrupted') |
| 153 [240] | 153 [1] |
| 154 | 154 |
| 155 $ hg diff | 155 $ hg diff |
| 156 diff -r cb6a2ab625bb d | 156 diff -r cb6a2ab625bb d |
| 157 --- a/d Thu Jan 01 00:00:00 1970 +0000 | 157 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
| 158 +++ b/d Thu Jan 01 00:00:00 1970 +0000 | 158 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
| 211 hit merge conflicts; retrying merge in working copy (inmemory !) | 211 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 212 merging d | 212 merging d |
| 213 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 213 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 214 unresolved merge conflicts | 214 unresolved merge conflicts |
| 215 (see 'hg help evolve.interrupted') | 215 (see 'hg help evolve.interrupted') |
| 216 [240] | 216 [1] |
| 217 $ echo foo > d | 217 $ echo foo > d |
| 218 $ hg resolve -m | 218 $ hg resolve -m |
| 219 (no more unresolved files) | 219 (no more unresolved files) |
| 220 continue: hg evolve --continue | 220 continue: hg evolve --continue |
| 221 $ hg evolve --continue | 221 $ hg evolve --continue |
| 263 hit merge conflicts; retrying merge in working copy (inmemory !) | 263 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 264 merging c | 264 merging c |
| 265 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 265 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 266 unresolved merge conflicts | 266 unresolved merge conflicts |
| 267 (see 'hg help evolve.interrupted') | 267 (see 'hg help evolve.interrupted') |
| 268 [240] | 268 [1] |
| 269 | 269 |
| 270 $ hg status | 270 $ hg status |
| 271 M c | 271 M c |
| 272 A d | 272 A d |
| 273 | 273 |
| 303 hit merge conflicts; retrying merge in working copy (inmemory !) | 303 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 304 merging c | 304 merging c |
| 305 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 305 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 306 unresolved merge conflicts | 306 unresolved merge conflicts |
| 307 (see 'hg help evolve.interrupted') | 307 (see 'hg help evolve.interrupted') |
| 308 [240] | 308 [1] |
| 309 | 309 |
| 310 $ echo foobar > c | 310 $ echo foobar > c |
| 311 $ hg resolve -m | 311 $ hg resolve -m |
| 312 (no more unresolved files) | 312 (no more unresolved files) |
| 313 continue: hg evolve --continue | 313 continue: hg evolve --continue |
| 380 hit merge conflicts; retrying merge in working copy (inmemory !) | 380 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 381 merging c | 381 merging c |
| 382 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 382 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 383 unresolved merge conflicts | 383 unresolved merge conflicts |
| 384 (see 'hg help evolve.interrupted') | 384 (see 'hg help evolve.interrupted') |
| 385 [240] | 385 [1] |
| 386 | 386 |
| 387 $ hg evolve --stop | 387 $ hg evolve --stop |
| 388 stopped the interrupted evolve | 388 stopped the interrupted evolve |
| 389 working directory is now at a3cc2042492f | 389 working directory is now at a3cc2042492f |
| 390 | 390 |