Mercurial > evolve
graph
-
tests: add more test of resolution of content-divergent changesetsThu, 07 Jun 2018 22:45:54 +0530, by Pulkit Goyal
-
evolvestate: store info about relocation while resolving content-divergenceThu, 07 Jun 2018 18:18:10 +0530, by Pulkit Goyal
-
evolve: factor out logic to merge content divergent csets in separate fnThu, 07 Jun 2018 18:13:54 +0530, by Pulkit Goyal
-
evolve: commit the transaction if conflicts occur while merging content-divThu, 07 Jun 2018 20:27:03 +0530, by Pulkit Goyal
-
tests: add tests for resolving content-divergence when different parentsThu, 07 Jun 2018 15:54:32 +0530, by Pulkit Goyal
-
evolve: implement resolution of content-divergence when on differet parentsFri, 01 Jun 2018 19:52:06 +0530, by Pulkit Goyal
-
tests: add tests for resolving content-divergence with parent changeFri, 01 Jun 2018 19:57:19 +0530, by Pulkit Goyal
-
CHANGELOG: add an entry about fixing issue5877Wed, 06 Jun 2018 03:49:17 +0530, by Pulkit Goyal