Mercurial > evolve
comparison tests/test-evolve-stop-phasediv.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 | ecbf61d90807 |
| children | e5d91fd1f319 |
comparison
equal
deleted
inserted
replaced
| 4669:daab6d665687 | 4676:b6c819facbe8 |
|---|---|
| 82 recreate:[6] added d | 82 recreate:[6] added d |
| 83 atop:[4] added d | 83 atop:[4] added d |
| 84 rebasing to destination parent: ca1b80f7960a | 84 rebasing to destination parent: ca1b80f7960a |
| 85 merging c | 85 merging c |
| 86 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 86 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 87 fix conflicts and see `hg help evolve.interrupted` | 87 unresolved merge conflicts |
| 88 (see 'hg help evolve.interrupted') | |
| 88 [1] | 89 [1] |
| 89 | 90 |
| 90 $ hg evolve --stop | 91 $ hg evolve --stop |
| 91 stopped the interrupted evolve | 92 stopped the interrupted evolve |
| 92 working directory is now at ca1b80f7960a | 93 working directory is now at ca1b80f7960a |