Mercurial > evolve
comparison tests/test-stabilize-conflict.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 a2fdbece7ce1 96ce1030d2fb |
comparison
equal
deleted
inserted
replaced
| 3977:a0a4f4de9ea3 | 3978:fb8e44c70798 |
|---|---|
| 138 | parent: 0:29ec1554cfaf | 138 | parent: 0:29ec1554cfaf |
| 139 | user: test | 139 | user: test |
| 140 | date: Thu Jan 01 00:00:00 1970 +0000 | 140 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 141 | summary: babar count up to ten | 141 | summary: babar count up to ten |
| 142 | | 142 | |
| 143 | * changeset: 4:71c18f70c34f | 143 | @ changeset: 4:71c18f70c34f |
| 144 | | user: test | 144 | | user: test |
| 145 | | date: Thu Jan 01 00:00:00 1970 +0000 | 145 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 146 | | instability: orphan | 146 | | instability: orphan |
| 147 | | summary: babar count up to fifteen | 147 | | summary: babar count up to fifteen |
| 148 | | | 148 | | |
| 230 | parent: 0:29ec1554cfaf | 230 | parent: 0:29ec1554cfaf |
| 231 | user: test | 231 | user: test |
| 232 | date: Thu Jan 01 00:00:00 1970 +0000 | 232 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 233 | summary: babar count up to ten | 233 | summary: babar count up to ten |
| 234 | | 234 | |
| 235 | * changeset: 6:1836b91c6c1d | 235 | @ changeset: 6:1836b91c6c1d |
| 236 | | user: test | 236 | | user: test |
| 237 | | date: Thu Jan 01 00:00:00 1970 +0000 | 237 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 238 | | instability: orphan | 238 | | instability: orphan |
| 239 | | summary: babar count up to fifteen | 239 | | summary: babar count up to fifteen |
| 240 | | | 240 | | |