Mercurial > evolve
graph
-
tests: fix a test case to not create conflictsThu, 14 Jun 2018 01:39:11 +0530, by Pulkit Goyal
-
evolve: introduce a resolutionparent variable and store it in evolvestateThu, 14 Jun 2018 01:06:12 +0530, by Pulkit Goyal
-
evolve: introduce a dirstatedance() fn to fix dirstate after parent changeWed, 13 Jun 2018 18:08:57 +0530, by Pulkit Goyal
-
evolve: create a new commit instead of amending one of the divergentsWed, 13 Jun 2018 17:15:10 +0530, by Pulkit Goyal
-
evolve: always order the revs to be evolvedTue, 12 Jun 2018 23:20:54 +0530, by Pulkit Goyal
-
tests: add test of resolution of content-divergent stacksTue, 12 Jun 2018 21:13:02 +0530, by Pulkit Goyal
-
evolve: improve error messages when conflicts occurTue, 12 Jun 2018 19:00:12 +0530, by Pulkit Goyal