Mercurial > evolve
log
age | author | description |
---|---|---|
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 |
Tue, 12 Jun 2018 21:13:02 +0530 | Pulkit Goyal | tests: add test of resolution of content-divergent stacks |
Tue, 12 Jun 2018 19:00:12 +0530 | Pulkit Goyal | evolve: improve error messages when conflicts occur |