Mercurial > evolve
comparison tests/test-evolve-orphan-merge.t @ 4676:b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
And it's worth making the suggestion an actual hint.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 06 Jun 2019 17:37:42 +0800 |
| parents | 30a544904238 |
| children | 4101fab78314 f0c18ad24273 |
comparison
equal
deleted
inserted
replaced
| 4669:daab6d665687 | 4676:b6c819facbe8 |
|---|---|
| 217 $ hg evolve --all --update | 217 $ hg evolve --all --update |
| 218 move:[10] foobar to c | 218 move:[10] foobar to c |
| 219 atop:[11] foo to c | 219 atop:[11] foo to c |
| 220 merging c | 220 merging c |
| 221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 222 fix conflicts and see `hg help evolve.interrupted` | 222 unresolved merge conflicts |
| 223 (see 'hg help evolve.interrupted') | |
| 223 [1] | 224 [1] |
| 224 | 225 |
| 225 $ echo FOObar > c | 226 $ echo FOObar > c |
| 226 $ hg resolve -m | 227 $ hg resolve -m |
| 227 (no more unresolved files) | 228 (no more unresolved files) |
| 272 $ hg evolve --all --update | 273 $ hg evolve --all --update |
| 273 move:[12] foobar to c | 274 move:[12] foobar to c |
| 274 atop:[13] foo to c | 275 atop:[13] foo to c |
| 275 merging c | 276 merging c |
| 276 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 277 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 277 fix conflicts and see `hg help evolve.interrupted` | 278 unresolved merge conflicts |
| 279 (see 'hg help evolve.interrupted') | |
| 278 [1] | 280 [1] |
| 279 | 281 |
| 280 $ echo foobar > c | 282 $ echo foobar > c |
| 281 $ hg resolve -m | 283 $ hg resolve -m |
| 282 (no more unresolved files) | 284 (no more unresolved files) |