Mercurial > evolve
graph
-
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
-
evolve: add a help topic `Interrupted-Evolve`Wed, 23 May 2018 01:11:59 +0530, by Pulkit Goyal
-
branching: merge with stableTue, 05 Jun 2018 03:37:15 +0200, by Pierre-Yves David
-
evolve: return the new node formed only as the replacementThu, 24 May 2018 02:12:14 +0530, by Pulkit Goyal
-
tests: add more test of --abort flag for content-divergence resolutionThu, 24 May 2018 17:04:20 +0530, by Pulkit Goyal
-
evolve: prompt user for branch selection while resolving content-divergenceMon, 04 Jun 2018 04:03:02 +0530, by Pulkit Goyal
-
evolve: pass the base revision in _completecontentdivergent()Tue, 05 Jun 2018 03:51:01 +0530, by Pulkit Goyal
-
evolve: store the base of content-divergents in evolvestateTue, 05 Jun 2018 03:49:49 +0530, by Pulkit Goyal
-
evolve: use cmdrewrite.amend() instead of creating a new commitTue, 05 Jun 2018 00:53:21 +0530, by Pulkit Goyal
-
corecompat: update the tests output to show phase update summarySun, 03 Jun 2018 01:59:41 +0530, by Pulkit Goyal
-
CHANGELOG: add an entry about issue 5808 being fixed stableSun, 03 Jun 2018 03:24:43 +0530, by Pulkit Goyal
-
next-prev: replace the error hint to mention about `--merge` flag stableSun, 03 Jun 2018 03:21:25 +0530, by Pulkit Goyal
-
tests: add tests for conflicts while respecting commands.update.check stableSun, 03 Jun 2018 03:13:47 +0530, by Pulkit Goyal
-
next: respect `commands.update.check` config option in `hg next` (issue5808) stableSun, 03 Jun 2018 02:37:13 +0530, by Pulkit Goyal
-
prev: respect `commands.update.check` config option in `hg prev` (issue5808) stableSun, 03 Jun 2018 02:36:24 +0530, by Pulkit Goyal
-
next: bail out early in `hg next --evolve` if dirty wdir stableSun, 03 Jun 2018 02:26:19 +0530, by Pulkit Goyal
-
tests: add test of `hg next --evolve` with dirty working directory stableSun, 03 Jun 2018 02:24:28 +0530, by Pulkit Goyal
-
CHANGELOG: add an entry about fixing issue5897 stableSun, 03 Jun 2018 03:35:22 +0530, by Pulkit Goyal
-
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897) stableSun, 27 May 2018 02:32:58 +0530, by Pulkit Goyal