Mercurial > evolve
graph
-
evolve: declare updated and pctx variables in stopevolve()Mon, 11 Jun 2018 00:43:39 +0530, by Pulkit Goyal
-
evolve: store the old other divergent node after relocation in evolvestateSun, 10 Jun 2018 22:52:11 +0530, by Pulkit Goyal
-
evolve: factor out logic for --stop flag in separate functionSun, 10 Jun 2018 22:42:57 +0530, by Pulkit Goyal
-
tests: add test for --stop flag when resolving multiparents content-divSun, 10 Jun 2018 22:38:08 +0530, by Pulkit Goyal
-
evolve: move logic to continue interrupted content-div resolution to new fnSun, 10 Jun 2018 20:35:48 +0530, by Pulkit Goyal
-
evolve: rename help topic evolve.interrupted-evolve to evolve.interruptedMon, 11 Jun 2018 01:12:12 +0530, by Pulkit Goyal
-
packaging: update tested-with statements in evolve and topic stableSat, 09 Jun 2018 00:15:27 +0530, by Pulkit Goyal
-
CHANGELOG: mention about 4.6.1 compatibility stableSat, 09 Jun 2018 00:12:08 +0530, by Pulkit Goyal
-
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3Fri, 08 Jun 2018 22:52:53 +0530, by Pulkit Goyal
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Fri, 08 Jun 2018 22:52:52 +0530, by Pulkit Goyal
-
test-compat: merge stable into mercurial-4.5 mercurial-4.5Fri, 08 Jun 2018 22:52:51 +0530, by Pulkit Goyal
-
utility: use ui.interactive() instead of checking config value stableTue, 22 May 2018 23:51:57 +0530, by Pulkit Goyal
-
CHANGELOG: add couple of entries about things fixed stableFri, 08 Jun 2018 19:48:53 +0530, by Pulkit Goyal
-
next-prev: add tests showing --merge not respected in some cases stableFri, 08 Jun 2018 18:32:48 +0530, by Pulkit Goyal
-
evolve: store the evolvestate if relocation results in conflictsThu, 07 Jun 2018 22:59:39 +0530, by Pulkit Goyal
-
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
-
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
-
evolve: add an `--update` flag to `hg evolve` commandThu, 24 May 2018 17:50:02 +0530, by Pulkit Goyal
-
tests: add tests for testing --abort while content-divergence resolutionThu, 24 May 2018 02:02:11 +0530, by Pulkit Goyal
-
evolve: fix storage of replacements and temprevs node in evolvestateThu, 24 May 2018 00:58:50 +0530, by Pulkit Goyal
-
tests: add more tests related to aborting while resolving phase-divergenceThu, 24 May 2018 00:58:35 +0530, by Pulkit Goyal
-
topic: suggest to clear a topic that becomes emptyWed, 23 May 2018 12:16:24 +0200, by Denis Laxalde
-
topic: display a hint pointing at help when a topic becomes non-emptyWed, 23 May 2018 11:37:37 +0200, by Denis Laxalde
-
branching: merge with compat fix on defaultThu, 24 May 2018 18:57:46 +0200, by Pierre-Yves David
-
evolve: add compat for repair.stripbmrevset which is moved to scmutil stableThu, 24 May 2018 01:50:26 +0530, by Pulkit Goyal