Mercurial > evolve
graph
-
evolve: _solveunstable() update progress only onceTue, 23 Apr 2019 09:45:45 -0700, by Martin von Zweigbergk
-
evolve: don't update progress just before clearing itTue, 23 Apr 2019 09:35:34 -0700, by Martin von Zweigbergk
-
evolve: clean up progress bar also when using -rTue, 23 Apr 2019 09:31:32 -0700, by Martin von Zweigbergk
-
tests: add some basic testing of progressTue, 23 Apr 2019 10:20:03 -0700, by Martin von Zweigbergk
-
evolve: increment progress *after* a whole merge commit is doneFri, 19 Apr 2019 10:03:39 -0700, by Martin von Zweigbergk
-
evolve: use util.acceptintervention() for closing transactionsFri, 19 Apr 2019 11:02:35 -0700, by Martin von Zweigbergk
-
evolve: use context manager for transactionsFri, 19 Apr 2019 10:32:32 -0700, by Martin von Zweigbergk
-
evolve: use consistent message and just re-raise InterventionRequiredFri, 19 Apr 2019 10:52:16 -0700, by Martin von Zweigbergk
-
evolve: use standard InterventionRequired instead of MergeFailureFri, 19 Apr 2019 10:47:12 -0700, by Martin von Zweigbergk
-
evolve: don't use exception for local flow controlFri, 19 Apr 2019 10:41:56 -0700, by Martin von Zweigbergk
-
evolve: reduce indentation with an early return statementTue, 23 Apr 2019 11:02:08 -0700, by Martin von Zweigbergk
-
evolve: remove a useless return statement at end of functionTue, 23 Apr 2019 11:01:44 -0700, by Martin von Zweigbergk
-
test: move a test to an appropriate test fileSun, 21 Apr 2019 13:04:40 +0530, by Sushil khanchi
-
test: improve the title of a testSun, 21 Apr 2019 12:07:26 +0530, by Sushil khanchi
-
test: remove duplicated testSun, 21 Apr 2019 12:06:31 +0530, by Sushil khanchi
-
evolve: warn user for the metadata being lost in public divergence resolutionSat, 09 Mar 2019 19:35:45 +0530, by Sushil khanchi
-
evolve: show a status message when merging leads to public csetWed, 17 Apr 2019 21:16:17 +0530, by Sushil khanchi
-
test: use a shorter test nameWed, 24 Apr 2019 20:32:01 +0200, by Pierre-Yves David
-
stack: rename troubledcount to unstablecountWed, 10 Apr 2019 18:20:33 +0800, by Anton Shestakov
-
evolve: use --all by default (BC)Wed, 24 Apr 2019 17:21:21 +0800, by Anton Shestakov
-
tests: add --rev to hg evolve to reduce test changes for the next patchWed, 24 Apr 2019 17:02:27 +0800, by Anton Shestakov
-
tests: add --no-all to hg evolve to reduce test changesWed, 24 Apr 2019 16:35:01 +0800, by Anton Shestakov
-
evolve: don't update after instability resolution by default (BC)Wed, 24 Apr 2019 15:59:02 +0200, by Anton Shestakov
-
tests: add --update to hg evolve to reduce test changes for the next patchSun, 14 Apr 2019 02:18:19 +0800, by Anton Shestakov
-
tests: don't create a nested repo for no reasonWed, 24 Apr 2019 15:57:49 +0200, by Anton Shestakov
-
branching: merge with stableWed, 24 Apr 2019 14:38:26 +0200, by Pierre-Yves David
-
Added tag 8.5.1 for changeset 05c9dcf5512e stableTue, 23 Apr 2019 15:57:04 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Tue, 23 Apr 2019 14:18:12 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5Tue, 23 Apr 2019 14:18:11 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6Tue, 23 Apr 2019 14:18:10 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7Tue, 23 Apr 2019 14:18:08 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8Tue, 23 Apr 2019 14:18:06 +0200, by Pierre-Yves David
-
test-compat: merge stable into mercurial-4.9 mercurial-4.9Tue, 23 Apr 2019 14:18:05 +0200, by Pierre-Yves David
-
evolve: fix progress display with hg<4.7 stableMon, 22 Apr 2019 22:14:26 -0700, by Martin von Zweigbergk
-
packaging: mark extensions as tested with 5.0 stableSat, 20 Apr 2019 05:21:14 +0200, by Pierre-Yves David
-
branching: merge with stableTue, 23 Apr 2019 13:26:35 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Tue, 23 Apr 2019 12:29:50 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5Tue, 23 Apr 2019 12:29:48 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6Tue, 23 Apr 2019 12:29:47 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7Tue, 23 Apr 2019 12:29:45 +0200, by Pierre-Yves David
-
evolve: use merge.update() for resolving phase divergenceMon, 11 Mar 2019 23:57:12 -0700, by Martin von Zweigbergk
-
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8Tue, 23 Apr 2019 12:29:44 +0200, by Pierre-Yves David
-
compat: drop support for Mercurial 4.4Tue, 23 Apr 2019 12:24:22 +0200, by Pierre-Yves David
-
test-compat: merge stable into mercurial-4.9 mercurial-4.9Tue, 23 Apr 2019 12:29:42 +0200, by Pierre-Yves David
-
compat: backed out changeset cfcb7eedc666 stableTue, 23 Apr 2019 12:20:12 +0200, by Pierre-Yves David
-
test-compat: adapt test output to 4.4 mercurial-4.4Tue, 23 Apr 2019 12:28:32 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Sat, 20 Apr 2019 03:55:11 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5Sat, 20 Apr 2019 03:55:10 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6Sat, 20 Apr 2019 03:55:09 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7Sat, 20 Apr 2019 03:55:07 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8Sat, 20 Apr 2019 03:55:06 +0200, by Pierre-Yves David
-
test-compat: merge stable into mercurial-4.9 mercurial-4.9Sat, 20 Apr 2019 03:55:04 +0200, by Pierre-Yves David
-
changelog: mention extensions isolation (issue6121) stableThu, 18 Apr 2019 23:51:13 +0200, by Pierre-Yves David
-
topic: only wrap wireprotocaps for repo with topic stableThu, 18 Apr 2019 13:03:01 +0200, by Pierre-Yves David
-
topic: only wrap _pushb2phases for repo with topic stableThu, 18 Apr 2019 13:02:52 +0200, by Pierre-Yves David
-
topic: only wrap handlecheckheads for repo with topic stableThu, 18 Apr 2019 13:02:44 +0200, by Pierre-Yves David
-
topic: only wrap wireprotobranchmap for repo with topic stableThu, 18 Apr 2019 13:02:06 +0200, by Pierre-Yves David
-
topic: only wrap _headssummary for repo with topic stableThu, 18 Apr 2019 13:01:39 +0200, by Pierre-Yves David
-
topic: only wrap desthistedit for repo with topic stableThu, 18 Apr 2019 12:41:41 +0200, by Pierre-Yves David
-
topic: only wrap _destupdatetopic for repo with topic stableThu, 18 Apr 2019 12:40:53 +0200, by Pierre-Yves David
-
topic: only wrap _destmergebranch for repo with topic stableThu, 18 Apr 2019 12:39:41 +0200, by Pierre-Yves David
-
topic: only wrap gettopicrepo for repo with topic stableThu, 18 Apr 2019 12:36:11 +0200, by Pierre-Yves David
-
topic: only wrap mergeupdate for repo with topic stableThu, 18 Apr 2019 11:13:49 +0200, by Pierre-Yves David
-
topic: only wrap committext for repo with topic stableThu, 18 Apr 2019 11:13:39 +0200, by Pierre-Yves David
-
topic: only affect `hg commit` behavior for repo with topic stableThu, 18 Apr 2019 11:13:24 +0200, by Pierre-Yves David
-
topic: only wrap workingctx.__init__ for repo with topic stableThu, 18 Apr 2019 11:13:14 +0200, by Pierre-Yves David
-
topic: introduce a `hastopicext(repo)` function stableThu, 18 Apr 2019 11:12:58 +0200, by Pierre-Yves David
-
tests: consolidate the public-content-divergent test casesWed, 17 Apr 2019 00:20:44 +0530, by Sushil khanchi
-
evolve: improve inline documentation for the public divergence resolutionWed, 17 Apr 2019 12:31:17 +0530, by Sushil khanchi
-
cleanup: remove a duplicated lineSun, 14 Apr 2019 20:26:05 +0530, by Sushil khanchi
-
branching: merge stable back into defaultWed, 17 Apr 2019 20:58:10 +0200, by Pierre-Yves David
-
tescompat: revert test change for mercurial-4.9 mercurial-4.9Wed, 17 Apr 2019 20:56:24 +0200, by Pierre-Yves David
-
branching: merge 8.5.0 expected output in stable stableWed, 17 Apr 2019 20:54:28 +0200, by Pierre-Yves David
-
testcompat: open a branch dedicated to mercurial 4.9 mercurial-4.9Wed, 17 Apr 2019 20:52:15 +0200, by Pierre-Yves David
-
topic: add compatibility for writing copy metadata in changelog.add() stableWed, 17 Apr 2019 18:46:41 +0800, by Anton Shestakov
-
serverminitopic: add compatibility for branchcache that now uses self._entries stableWed, 17 Apr 2019 16:18:22 +0800, by Anton Shestakov
-
branching: merge stable into defaultFri, 12 Apr 2019 02:21:09 +0200, by Pierre-Yves David
-
packaging: mark version as development version stableFri, 12 Apr 2019 02:20:24 +0200, by Pierre-Yves David
-
Added tag 8.5.0 for changeset 33c617626fd9 stableFri, 12 Apr 2019 02:17:03 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Thu, 11 Apr 2019 22:44:53 +0200, by Pierre-Yves David
-
branching: merge stable back into defaultFri, 12 Apr 2019 02:07:53 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5Thu, 11 Apr 2019 22:42:14 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6Thu, 11 Apr 2019 22:42:13 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7Thu, 11 Apr 2019 22:41:41 +0200, by Pierre-Yves David
-
test-compat: merge stable into mercurial-4.8 mercurial-4.8Thu, 11 Apr 2019 22:41:25 +0200, by Pierre-Yves David
-
changelog: merge 8.4.1 and 8.5.1 entries stableThu, 11 Apr 2019 22:41:06 +0200, by Pierre-Yves David
-
branching: merge default change into stable stableThu, 11 Apr 2019 21:12:09 +0200, by Pierre-Yves David
-
branching: merge default branch in stable to prepare 8.5.0 release stableThu, 11 Apr 2019 22:13:55 +0200, by Pierre-Yves David
-
uncommit: abort if an explicitly given file cannot be uncommitted (BC)Tue, 02 Apr 2019 22:42:01 -0400, by Matt Harbison
-
evolve: store --update flag state in evolvestate fileThu, 11 Apr 2019 17:45:36 +0800, by Anton Shestakov
-
state: implement cmdstate.__contains__()Fri, 12 Apr 2019 02:55:34 +0800, by Anton Shestakov
-
changelog: mention Martin work on phase-divergenceThu, 11 Apr 2019 21:19:01 +0200, by Pierre-Yves David
-
test: revert update from 5.0 record logic stableThu, 11 Apr 2019 21:09:31 +0200, by Pierre-Yves David
-
tests: remove note about already implemented --confirm with --continueThu, 11 Apr 2019 17:42:48 +0800, by Anton Shestakov
-
evolve: use merge.update() for resolving phase divergenceMon, 11 Mar 2019 23:57:12 -0700, by Martin von Zweigbergk
-
evolve: compat patch for recordfilter change in mercurialWed, 10 Apr 2019 23:19:29 +0530, by Sushil khanchi
-
test: add file cancelation scenario for phase-divergenceWed, 10 Apr 2019 21:03:56 +0200, by Pierre-Yves David
-
test: introduce a more complete test for phase-divergenceWed, 10 Apr 2019 20:43:42 +0200, by Pierre-Yves David
-
test: rename test about content divergent meta dataWed, 10 Apr 2019 20:24:55 +0200, by Pierre-Yves David
-
test: cleanup title and doc phase-divergent casesWed, 10 Apr 2019 20:18:14 +0200, by Pierre-Yves David
-
test: remove remaining duplicated fileWed, 10 Apr 2019 20:03:07 +0200, by Pierre-Yves David
-
test: add test for content-divergence with file removalWed, 10 Apr 2019 17:57:11 +0200, by Pierre-Yves David
-
test: clarify changeset concent in the first content-divergence testWed, 10 Apr 2019 17:29:40 +0200, by Pierre-Yves David
-
branching: merge with stableWed, 10 Apr 2019 16:59:58 +0200, by Pierre-Yves David
-
branching: merge with test consolidationWed, 10 Apr 2019 16:59:28 +0200, by Pierre-Yves David
-
branching: merge with stableWed, 10 Apr 2019 16:40:58 +0200, by Pierre-Yves David
-
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4Sun, 07 Apr 2019 20:00:16 +0200, by Joerg Sonnenberger
-
evolve: when using evolve, cache files belong into the master repoSun, 07 Apr 2019 19:53:53 +0200, by Joerg Sonnenberger
-
evolve: make sure div resolution don't replace the initial author (issue6113) stableWed, 10 Apr 2019 15:37:29 +0200, by Sushil khanchi
-
evolve: add test which demonstrate issue6113 stableWed, 10 Apr 2019 15:26:41 +0200, by Sushil khanchi
-
test: consolidate the content-divergent test cases stableWed, 10 Apr 2019 14:32:00 +0200, by Pierre-Yves David
-
changelog: mention the fix to issue6057 stableTue, 09 Apr 2019 21:16:49 +0200, by Pierre-Yves David