Mercurial > evolve
comparison tests/test-evolve.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 | 9c0b37be8582 |
| children | a689f07d5663 85c99079d41f |
comparison
equal
deleted
inserted
replaced
| 3977:a0a4f4de9ea3 | 3978:fb8e44c70798 |
|---|---|
| 1541 $ glog -r "be23044af550::" --hidden | 1541 $ glog -r "be23044af550::" --hidden |
| 1542 @ 38:61abd81de026@default(draft) will be evolved safely | 1542 @ 38:61abd81de026@default(draft) will be evolved safely |
| 1543 | | 1543 | |
| 1544 o 37:df89d30f23e2@default(draft) amended | 1544 o 37:df89d30f23e2@default(draft) amended |
| 1545 | | 1545 | |
| 1546 | * 36:59c37c5bebd1@default(draft) will cause conflict at evolve | 1546 | @ 36:59c37c5bebd1@default(draft) will cause conflict at evolve |
| 1547 | | | 1547 | | |
| 1548 | x 35:7cc12c6c7862@default(draft) will be evolved safely | 1548 | x 35:7cc12c6c7862@default(draft) will be evolved safely |
| 1549 | | | 1549 | | |
| 1550 | x 34:98c7ab460e6b@default(draft) will be amended | 1550 | x 34:98c7ab460e6b@default(draft) will be amended |
| 1551 |/ | 1551 |/ |