Mercurial > evolve
graph
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Wed, 05 Jun 2019 17:56:44 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5Wed, 05 Jun 2019 17:46:06 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6Wed, 05 Jun 2019 17:45:45 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7Wed, 05 Jun 2019 17:42:50 +0200, by Pierre-Yves David
-
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8Wed, 05 Jun 2019 17:39:32 +0200, by Pierre-Yves David
-
test-compat: merge stable into mercurial-4.9 mercurial-4.9Wed, 05 Jun 2019 17:38:32 +0200, by Pierre-Yves David
-
branching: merge with 9.0.0Fri, 07 Jun 2019 02:25:02 +0200, by Pierre-Yves David
-
branching: merge back with stableFri, 07 Jun 2019 02:24:08 +0200, by Pierre-Yves David
-
packaging: mark as development versions stableFri, 07 Jun 2019 02:22:05 +0200, by Pierre-Yves David
-
Added tag 9.0.0 for changeset 756db65030c6 stableFri, 07 Jun 2019 02:15:50 +0200, by Pierre-Yves David
-
doc: clarify the status of configuration of the obshashrange protocol stableThu, 06 Jun 2019 14:32:25 +0200, by Pierre-Yves David
-
templatekw: keep compatibility with Mercurial 4.5 stableWed, 05 Jun 2019 19:45:35 +0200, by Pierre-Yves David
-
branching: merge with stableTue, 04 Jun 2019 11:08:44 +0200, by Pierre-Yves David
-
templates: don't alias keywords directly stableSat, 01 Jun 2019 02:30:14 +0200, by Joerg Sonnenberger
-
stack: remove 'topic.' prefix from colors/labelsTue, 28 May 2019 16:46:18 +0800, by Anton Shestakov
-
stack: handle hash sizes when --debug flag is providedSat, 18 May 2019 16:56:47 +0800, by Anton Shestakov
-
stack: always provide (full) node hash to non-default --templateFri, 17 May 2019 17:50:25 +0800, by Anton Shestakov
-
stack: remove unnecessary prefix from stack output with non-default --templateFri, 17 May 2019 17:42:06 +0800, by Anton Shestakov
-
stack: provide context to formatter with non-default --templateFri, 17 May 2019 17:59:58 +0800, by Anton Shestakov
-
stack: leverage labelsgen() to produce all needed labels for fm.write()Sat, 11 May 2019 17:14:32 +0800, by Anton Shestakov
-
stack: check if stack is empty more pythonicallyWed, 08 May 2019 16:00:34 +0800, by Anton Shestakov
-
stack: implement __bool__ and __nonzero__Wed, 08 May 2019 15:57:54 +0800, by Anton Shestakov
-
stack: get stack data directly from stack and remove stackdata()Sun, 05 May 2019 17:39:46 +0800, by Anton Shestakov
-
stack: use stack._revs instead of stack.revs[1:] in external children revsetSun, 05 May 2019 16:14:53 +0800, by Anton Shestakov
-
test: update output to match the parent changesetsTue, 04 Jun 2019 10:30:56 +0200, by Pierre-Yves David
-
topic: add a simple option to reject publishingMon, 27 May 2019 03:42:35 +0200, by Pierre-Yves David
-
compat: adjust `wrapadd` for upstreamTue, 04 Jun 2019 10:07:08 +0200, by Pierre-Yves David
-
debian: override default value for SPHINXBUILD in docs/makefile stableSun, 05 May 2019 22:48:41 +0530, by Faheem Mitha
-
obshashtree: move obshashtree in its own moduleMon, 27 May 2019 02:19:48 +0200, by Pierre-Yves David
-
obsdiscovery: drop `obshash` discovery protocol (issue6136)Mon, 27 May 2019 01:53:36 +0200, by Pierre-Yves David
-
cmdrewrite: use context manager for some locks and transactionsThu, 09 May 2019 09:42:51 -0700, by Martin von Zweigbergk
-
evolve: mention that --all is default, in list of optionsMon, 29 Apr 2019 23:43:16 +0530, by Sushil khanchi
-
touch: use util.acceptintervention() for closing the transactionMon, 13 May 2019 18:47:58 +0530, by Sushil khanchi
-
touch: use context manager for locksMon, 13 May 2019 18:45:00 +0530, by Sushil khanchi
-
touch: extract the logic of touching rev's to its own functionMon, 13 May 2019 18:39:43 +0530, by Sushil khanchi
-
changelog: mention user merging in the changelogMon, 27 May 2019 02:42:11 +0200, by Pierre-Yves David
-
evolve: consider using three way merge to get the user for div resolutionSun, 05 May 2019 18:24:59 +0530, by Sushil khanchi
-
evolve: add tests for the case when div csets has different usersSun, 05 May 2019 18:24:50 +0530, by Sushil khanchi
-
branching: merge with stableFri, 03 May 2019 01:23:12 +0200, by Pierre-Yves David
-
evolve: move status msg to verbose mode in content-divergence resolutionFri, 26 Apr 2019 01:20:08 +0530, by Sushil khanchi
-
debian: Override default value for SPHINXBUILD in docs/makefile stableFri, 03 May 2019 03:52:44 +0530, by Faheem Mitha
-
topic: add test to increase code coverage in case of multiple topics stableSat, 27 Apr 2019 20:56:37 +0530, by Sushil khanchi
-
changelog: --no-update is the default, recommend --update insteadSat, 27 Apr 2019 17:11:12 +0800, by Anton Shestakov
-
topic: drop support for accessing csets in branch stack using bxx (issue6119)Sat, 27 Apr 2019 01:18:08 +0300, by Pulkit Goyal
-
legacy: drop the check for `obsolete._enabled` stableMon, 29 Apr 2019 23:16:29 -0400, by Matt Harbison
-
docs: drop references to the old temporary commit that was created with amendSun, 28 Apr 2019 00:21:28 -0400, by Matt Harbison
-
templatekw: add `instabilities` alias for `troubles`Sat, 27 Apr 2019 22:45:16 -0400, by Matt Harbison
-
revset: switch internal uses and tests to `predecessors` from legacy nameSat, 27 Apr 2019 22:59:48 -0400, by Matt Harbison
-
revset: add `predecessor` aliases for `precursors` and `allprecursors`Sat, 27 Apr 2019 22:33:16 -0400, by Matt Harbison
-
revset: add `unstable` alias for `troubled`Sat, 27 Apr 2019 22:24:30 -0400, by Matt Harbison
-
docs: change `bumped` references to `phase-divergent`Sat, 27 Apr 2019 21:54:52 -0400, by Matt Harbison
-
docs: change `divergent` references to `content-divergent`Sat, 27 Apr 2019 21:41:04 -0400, by Matt Harbison
-
docs: change `troubled` references to `unstable`Sat, 27 Apr 2019 21:27:54 -0400, by Matt Harbison
-
docs: change `unstable` references to `orphan`Sat, 27 Apr 2019 21:24:18 -0400, by Matt Harbison
-
doc: correct a typoSat, 27 Apr 2019 21:09:47 -0400, by Matt Harbison
-
docs: change `troubles` references to `instability`Sat, 27 Apr 2019 19:42:42 -0400, by Matt Harbison
-
docs: change `precursors` references to `predecessors`Sat, 27 Apr 2019 19:32:03 -0400, by Matt Harbison
-
docs: import figure diagrams with inkscape 0.92Sat, 27 Apr 2019 14:42:48 -0400, by Matt Harbison
-
messages: standardize on "working copy is now at" including "is"Thu, 25 Apr 2019 15:14:21 -0700, by Martin von Zweigbergk
-
evolve: move more of the progress-related variables togetherThu, 25 Apr 2019 13:58:29 -0700, by Martin von Zweigbergk
-
evolve: delete dead calculation of number of troubled revisionsThu, 25 Apr 2019 14:02:11 -0700, by Martin von Zweigbergk
-
evolve: drop nested locks and transactionsFri, 19 Apr 2019 10:23:53 -0700, by Martin von Zweigbergk
-
next: start transaction before calling _solveone()Fri, 19 Apr 2019 11:12:00 -0700, by Martin von Zweigbergk
-
evolve: use single transaction also when continuingFri, 19 Apr 2019 10:22:25 -0700, by Martin von Zweigbergk
-
evolve: run in a single transactionFri, 19 Apr 2019 09:41:39 -0700, by Martin von Zweigbergk
-
evolve: extract function for solving one revision, including mergesFri, 19 Apr 2019 10:01:32 -0700, by Martin von Zweigbergk
-
evolve: mention that --all is the default behavior nowThu, 25 Apr 2019 17:20:32 +0800, by Anton Shestakov
-
evolve: mention that not all successful operations currently update wdirThu, 25 Apr 2019 17:19:41 +0800, by Anton Shestakov
-
evolve: add progress support for --continueTue, 23 Apr 2019 11:07:28 -0700, by Martin von Zweigbergk
-
evolve: reduce scope of progress-related variablesTue, 23 Apr 2019 10:56:42 -0700, by Martin von Zweigbergk
-
evolve: move progress-clearing out of _cleanup()Tue, 23 Apr 2019 10:49:47 -0700, by Martin von Zweigbergk
-
evolve: stop passing no-op "progresscb" into continueevolve()Tue, 23 Apr 2019 10:52:33 -0700, by Martin von Zweigbergk
-
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