Mercurial > evolve
graph
-
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
-
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
-
evolve: update the readme with more information about contribution stableWed, 23 May 2018 11:18:14 +0200, by Pierre-Yves David
-
topic: dedent items about publishing behavior in docstring stableWed, 23 May 2018 11:03:31 +0200, by Denis Laxalde
-
topic: use preformatted block for config snippets documentation stableWed, 23 May 2018 11:00:11 +0200, by Denis Laxalde
-
branching: merge with stableWed, 23 May 2018 01:24:02 +0200, by Pierre-Yves David
-
content-div: add test showing `--stop` works during interrupted resolutionTue, 22 May 2018 21:33:50 +0530, by Pulkit Goyal
-
evolve: create new commit while resolving content-divergenceMon, 23 Apr 2018 14:48:53 +0530, by Pulkit Goyal
-
content-divergence: store the resolved revs in evolvestate['replacements']Tue, 22 May 2018 20:33:42 +0530, by Pulkit Goyal
-
utility: use ui.interactive() instead of checking config valueTue, 22 May 2018 23:51:57 +0530, by Pulkit Goyal
-
evolve: make `--abort` strip the temporary revs created during resolutionWed, 23 May 2018 02:46:20 +0530, by Pulkit Goyal
-
evolve: store a list of temprevs in evolvestateWed, 23 May 2018 02:43:23 +0530, by Pulkit Goyal
-
evolve: check for None before adding in set of revisions to stripWed, 23 May 2018 02:36:14 +0530, by Pulkit Goyal
-
evolve: return the new replacement node to be stored in evolvestateWed, 23 May 2018 02:33:14 +0530, by Pulkit Goyal
-
evolve: don't make values of replacements dict listsWed, 23 May 2018 02:39:38 +0530, by Pulkit Goyal
-
tests: add a test file `--abort` flag while resolving phase-divergenceWed, 23 May 2018 02:41:08 +0530, by Pulkit Goyal
-
evolve: pass revisions as strings to commands.*() stableTue, 15 May 2018 22:17:27 -0700, by Martin von Zweigbergk
-
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.tWed, 23 May 2018 01:27:13 +0530, by Pulkit Goyal
-
branching: merge with branch for stableMon, 21 May 2018 16:56:52 +0200, by Pierre-Yves David
-
compat: update obshashrange test outputMon, 21 May 2018 16:25:29 +0200, by Boris Feld
-
test: update to new outputsMon, 21 May 2018 14:56:51 +0200, by Boris Feld
-
compat: fix obslog with Mercurial 4.6+Mon, 21 May 2018 13:07:49 +0200, by Boris Feld
-
debian: add line to clean-docs target to delete additional docs file stableSat, 19 May 2018 18:26:36 +0530, by Faheem Mitha
-
amend: use context manager for locks (issue5887) stableMon, 14 May 2018 15:25:38 -0700, by Martin von Zweigbergk
-
evolve: point to '--abort' in verbose status message stableThu, 10 May 2018 21:37:28 -0700, by Martin von Zweigbergk
-
evolvecmd: add comments and new lines in content-divergence handling logicSun, 22 Apr 2018 20:14:42 +0530, by Pulkit Goyal
-
evolve: show cset hash in "merging conetnt-divergent changeset"Sun, 29 Apr 2018 19:18:54 +0530, by Pulkit Goyal
-
evolve: show cset hash in "update to local conflict" messageSun, 29 Apr 2018 19:14:41 +0530, by Pulkit Goyal
-
evolve: use hg.updaterepo() instead of hg.update() to hide statsSun, 29 Apr 2018 19:11:29 +0530, by Pulkit Goyal
-
evolve: fix the conflicts error message during content-divergence resolutionSun, 29 Apr 2018 19:04:18 +0530, by Pulkit Goyal
-
evolve: add logic to continue interrupted content-divergence resolutionSun, 29 Apr 2018 18:51:56 +0530, by Pulkit Goyal
-
evolve: store the evolvestate file when encountering conflictsSun, 29 Apr 2018 18:48:36 +0530, by Pulkit Goyal
-
evolve: take out logic to complete phase-divergence in separate fnSun, 29 Apr 2018 18:13:29 +0530, by Pulkit Goyal
-
evolve: store divergent nodes in evolvestate when resolving content-divergenceSun, 29 Apr 2018 17:54:01 +0530, by Pulkit Goyal
-
branching: merge stable into defaultWed, 02 May 2018 11:59:06 +0200, by Pierre-Yves David
-
tests: add test showing `hg evolve --stop` works fine with phase-divergence stableSat, 28 Apr 2018 18:44:07 +0530, by Pulkit Goyal
-
tests: rename the test file to add 'orphan' in the name stableSat, 28 Apr 2018 18:03:32 +0530, by Pulkit Goyal
-
tests: test that `hg obslog wdir()` aborts with a useful message stableFri, 27 Apr 2018 16:28:34 +0800, by Anton Shestakov
-
obshistory: make obslog work when a commit doesn't have any description stableFri, 27 Apr 2018 16:19:45 +0800, by Anton Shestakov
-
obshistory: use a more appropriate type for obslog entries stableFri, 27 Apr 2018 16:14:10 +0800, by Anton Shestakov
-
packaging: mark as development versionWed, 25 Apr 2018 14:19:13 +0100, by Pierre-Yves David
-
branching: merge with latest releaseWed, 25 Apr 2018 14:18:19 +0100, by Pierre-Yves David
-
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3Wed, 25 Apr 2018 14:09:36 +0100, by Pierre-Yves David
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Wed, 25 Apr 2018 14:09:35 +0100, by Pierre-Yves David
-
test-compat: merge stable into mercurial-4.5 mercurial-4.5Wed, 25 Apr 2018 14:09:34 +0100, by Pierre-Yves David
-
Added tag 8.0.0 for changeset 116cdd8c102a stableWed, 25 Apr 2018 14:09:14 +0100, by Pierre-Yves David
-
packagin: update `tested-with` statement stableWed, 25 Apr 2018 13:55:52 +0100, by Pierre-Yves David
-
testcompat: update output for Mercurial 4.3 mercurial-4.3Wed, 25 Apr 2018 01:58:45 +0100, by Pierre-Yves David
-
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3Mon, 23 Apr 2018 12:23:00 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Mon, 23 Apr 2018 12:11:10 +0200, by Pierre-Yves David
-
testcompat: revert output change from new capabilities mercurial-4.5Tue, 24 Apr 2018 08:57:18 +0100, by Pierre-Yves David
-
testcompat: revert output change from 54a469cd5b26 mercurial-4.5Tue, 24 Apr 2018 08:42:47 +0100, by Pierre-Yves David
-
testcompat: revert output change from 1de6ba0ac6d7 mercurial-4.5Tue, 24 Apr 2018 08:41:57 +0100, by Pierre-Yves David
-
testcompat: merge stable into mercurial-4.5 mercurial-4.5Mon, 23 Apr 2018 12:10:26 +0200, by Pierre-Yves David