Mercurial > evolve
comparison tests/test-evolve-abort-phasediv.t @ 3978:fb8e44c70798 stable
evolve: set the second parent if we get conflicts while evolving
This patch makes sure we set the second parent correctly if we run into
conflicts while evolving. Also, we need to make sure to reset to one parent
before committing.
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Sat, 18 Aug 2018 21:03:45 +0530 |
| parents | d081528bb372 |
| children | 684cc3418ecd 25981fae92f9 |
comparison
equal
deleted
inserted
replaced
| 3977:a0a4f4de9ea3 | 3978:fb8e44c70798 |
|---|---|
| 111 $ hg parents | 111 $ hg parents |
| 112 changeset: 3:ca1b80f7960a | 112 changeset: 3:ca1b80f7960a |
| 113 user: test | 113 user: test |
| 114 date: Thu Jan 01 00:00:00 1970 +0000 | 114 date: Thu Jan 01 00:00:00 1970 +0000 |
| 115 summary: added c | 115 summary: added c |
| 116 | |
| 117 changeset: 6:ddba58020bc0 | |
| 118 tag: tip | |
| 119 parent: 1:c7586e2a9264 | |
| 120 user: test | |
| 121 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 122 instability: phase-divergent | |
| 123 summary: added d | |
| 116 | 124 |
| 117 | 125 |
| 118 $ hg evolve --abort | 126 $ hg evolve --abort |
| 119 evolve aborted | 127 evolve aborted |
| 120 working directory is now at ddba58020bc0 | 128 working directory is now at ddba58020bc0 |