Mercurial > evolve
graph
-
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
-
evolve: pop up editor if conflicts occur while merging commit messagesWed, 06 Jun 2018 03:26:47 +0530, by Pulkit Goyal
-
evolve: merge commit messages while resolving content-divergence (issue5877)Mon, 04 Jun 2018 01:28:02 +0530, by Pulkit Goyal
-
evolve: move if-else block under the right blockWed, 06 Jun 2018 01:19:36 +0530, by Pulkit Goyal
-
tests: make sure we don't result in commit messages conflictTue, 05 Jun 2018 22:02:24 +0530, by Pulkit Goyal
-
tests: don't use mkcommit shell function in test-divergent.tTue, 05 Jun 2018 21:02:09 +0530, by Pulkit Goyal
-
evolve: remove duplicated documentationWed, 06 Jun 2018 14:35:36 +0200, by Pierre-Yves David
-
evolve: show `hg help evolve.interrupted-evolve` in error when conflictsWed, 06 Jun 2018 04:09:49 +0530, by Pulkit Goyal