Mercurial > evolve
comparison tests/test-evolve-phase.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 | 629558d09898 |
| children | 684cc3418ecd bcd52ce0916d |
comparison
equal
deleted
inserted
replaced
| 3977:a0a4f4de9ea3 | 3978:fb8e44c70798 |
|---|---|
| 101 +>>>>>>> evolving: 13833940840c - test: c | 101 +>>>>>>> evolving: 13833940840c - test: c |
| 102 | 102 |
| 103 $ hg glog | 103 $ hg glog |
| 104 @ 3 - 87495ea7c9ec b (draft) | 104 @ 3 - 87495ea7c9ec b (draft) |
| 105 | | 105 | |
| 106 | * 2 - 13833940840c c (secret) | 106 | @ 2 - 13833940840c c (secret) |
| 107 | | | 107 | | |
| 108 | x 1 - 1e6c11564562 b (draft) | 108 | x 1 - 1e6c11564562 b (draft) |
| 109 |/ | 109 |/ |
| 110 o 0 - cb9a9f314b8b a (draft) | 110 o 0 - cb9a9f314b8b a (draft) |
| 111 | 111 |