Mercurial > evolve
log
| age | author | description |
|---|---|---|
| Thu, 14 Jun 2018 02:58:30 +0200 | Pierre-Yves David | changelog: add a changelog entry about divergence resolution |
| Thu, 14 Jun 2018 01:39:33 +0530 | Pulkit Goyal | evolve: create resolved cset on successors of current parents |
| Thu, 14 Jun 2018 01:39:11 +0530 | Pulkit Goyal | tests: fix a test case to not create conflicts |
| Thu, 14 Jun 2018 01:06:12 +0530 | Pulkit Goyal | evolve: introduce a resolutionparent variable and store it in evolvestate |
| Wed, 13 Jun 2018 18:08:57 +0530 | Pulkit Goyal | evolve: introduce a dirstatedance() fn to fix dirstate after parent change |
| Wed, 13 Jun 2018 17:15:10 +0530 | Pulkit Goyal | evolve: create a new commit instead of amending one of the divergents |
| Tue, 12 Jun 2018 23:20:54 +0530 | Pulkit Goyal | evolve: always order the revs to be evolved |