Mercurial > evolve
graph
-
stablesort: make sure heads are processed in sorted orderFri, 29 Jun 2018 16:51:56 +0200, by Pierre-Yves David
-
evolve: move the bookmarks also when updating to successor (issue5923)Tue, 19 Jun 2018 23:21:54 +0530, by Pulkit Goyal
-
tests: add test to demonstrate issue5923Tue, 19 Jun 2018 23:21:44 +0530, by Pulkit Goyal
-
changelog: add an entry about the new `evolve.interrupted` sectionThu, 28 Jun 2018 17:26:16 +0200, by Pierre-Yves David
-
evolve: make one missed error to align other error messagesFri, 15 Jun 2018 00:50:17 +0530, by Pulkit Goyal
-
evolve: raise error.InterventionRequired instead of Abort when conflictsFri, 15 Jun 2018 00:16:29 +0530, by Pulkit Goyal
-
changelog: add a changelog entry about divergence resolutionThu, 14 Jun 2018 02:58:30 +0200, by Pierre-Yves David
-
evolve: create resolved cset on successors of current parentsThu, 14 Jun 2018 01:39:33 +0530, by Pulkit Goyal
-
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
-
evolve: point to `hg help evolve.interrupted` while resolving content-divTue, 12 Jun 2018 04:01:19 +0530, by Pulkit Goyal
-
tests: add test about aborting content-divergence when multiple parentsTue, 12 Jun 2018 03:29:13 +0530, by Pulkit Goyal
-
CHANGELOG: add an entry about the --update flagWed, 13 Jun 2018 15:47:19 +0530, by Pulkit Goyal
-
evolve: show unfinished information in `hg status -v` (issue5886)Wed, 06 Jun 2018 04:29:05 +0530, by Pulkit Goyal
-
style: drop a (commented) debug printTue, 12 Jun 2018 13:58:14 +0200, by Denis Laxalde
-
tests: update tests output with changes in d0abd7949ea3 in core hgSun, 10 Jun 2018 20:58:55 +0530, by Pulkit Goyal
-
branching: merge with stableTue, 12 Jun 2018 10:40:57 +0200, by Pierre-Yves David
-
changelog: add a couple of missing entry stableMon, 11 Jun 2018 20:24:45 +0200, by Pierre-Yves David
-
evolve: strip the extra obsmarkers if any on `hg evolve --abort`Mon, 11 Jun 2018 20:17:56 +0530, by Pulkit Goyal
-
evolve: store the obsmarkers to be deleted in evolvestateMon, 11 Jun 2018 20:13:36 +0530, by Pulkit Goyal
-
evolve: store obsmarkers to be deleted in evolvestateMon, 11 Jun 2018 15:52:11 +0530, by Pulkit Goyal
-
evolve: factor out logic to merge branches in separate functionMon, 11 Jun 2018 15:38:43 +0530, by Pulkit Goyal
-
tests: add more test of --stop while resolving content-divergenceMon, 11 Jun 2018 01:00:57 +0530, by Pulkit Goyal
-
evolve: strip the relocation commit on `hg evolve --stop`Mon, 11 Jun 2018 00:47:28 +0530, by Pulkit Goyal
-
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