| Sat, 27 Apr 2019 22:59:48 -0400 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
| Sat, 27 Apr 2019 22:33:16 -0400 |
Matt Harbison |
revset: add `predecessor` aliases for `precursors` and `allprecursors`
|
| Sat, 27 Apr 2019 22:24:30 -0400 |
Matt Harbison |
revset: add `unstable` alias for `troubled`
|
| Sat, 27 Apr 2019 21:54:52 -0400 |
Matt Harbison |
docs: change `bumped` references to `phase-divergent`
|
| Sat, 27 Apr 2019 21:41:04 -0400 |
Matt Harbison |
docs: change `divergent` references to `content-divergent`
|
| Sat, 27 Apr 2019 21:27:54 -0400 |
Matt Harbison |
docs: change `troubled` references to `unstable`
|
| Sat, 27 Apr 2019 21:24:18 -0400 |
Matt Harbison |
docs: change `unstable` references to `orphan`
|
| Sat, 27 Apr 2019 21:09:47 -0400 |
Matt Harbison |
doc: correct a typo
|
| Sat, 27 Apr 2019 19:42:42 -0400 |
Matt Harbison |
docs: change `troubles` references to `instability`
|
| Sat, 27 Apr 2019 19:32:03 -0400 |
Matt Harbison |
docs: change `precursors` references to `predecessors`
|
| Sat, 27 Apr 2019 14:42:48 -0400 |
Matt Harbison |
docs: import figure diagrams with inkscape 0.92
|
| Thu, 25 Apr 2019 15:14:21 -0700 |
Martin von Zweigbergk |
messages: standardize on "working copy is now at" including "is"
|
| Thu, 25 Apr 2019 13:58:29 -0700 |
Martin von Zweigbergk |
evolve: move more of the progress-related variables together
|
| Thu, 25 Apr 2019 14:02:11 -0700 |
Martin von Zweigbergk |
evolve: delete dead calculation of number of troubled revisions
|
| Fri, 19 Apr 2019 10:23:53 -0700 |
Martin von Zweigbergk |
evolve: drop nested locks and transactions
|
| Fri, 19 Apr 2019 11:12:00 -0700 |
Martin von Zweigbergk |
next: start transaction before calling _solveone()
|
| Fri, 19 Apr 2019 10:22:25 -0700 |
Martin von Zweigbergk |
evolve: use single transaction also when continuing
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
| Fri, 19 Apr 2019 10:01:32 -0700 |
Martin von Zweigbergk |
evolve: extract function for solving one revision, including merges
|
| Thu, 25 Apr 2019 17:20:32 +0800 |
Anton Shestakov |
evolve: mention that --all is the default behavior now
|
| Thu, 25 Apr 2019 17:19:41 +0800 |
Anton Shestakov |
evolve: mention that not all successful operations currently update wdir
|
| Tue, 23 Apr 2019 11:07:28 -0700 |
Martin von Zweigbergk |
evolve: add progress support for --continue
|
| Tue, 23 Apr 2019 10:56:42 -0700 |
Martin von Zweigbergk |
evolve: reduce scope of progress-related variables
|
| Tue, 23 Apr 2019 10:49:47 -0700 |
Martin von Zweigbergk |
evolve: move progress-clearing out of _cleanup()
|
| Tue, 23 Apr 2019 10:52:33 -0700 |
Martin von Zweigbergk |
evolve: stop passing no-op "progresscb" into continueevolve()
|
| Tue, 23 Apr 2019 09:45:45 -0700 |
Martin von Zweigbergk |
evolve: _solveunstable() update progress only once
|
| Tue, 23 Apr 2019 09:35:34 -0700 |
Martin von Zweigbergk |
evolve: don't update progress just before clearing it
|
| Tue, 23 Apr 2019 09:31:32 -0700 |
Martin von Zweigbergk |
evolve: clean up progress bar also when using -r
|
| Tue, 23 Apr 2019 10:20:03 -0700 |
Martin von Zweigbergk |
tests: add some basic testing of progress
|
| Fri, 19 Apr 2019 10:03:39 -0700 |
Martin von Zweigbergk |
evolve: increment progress *after* a whole merge commit is done
|
| Fri, 19 Apr 2019 11:02:35 -0700 |
Martin von Zweigbergk |
evolve: use util.acceptintervention() for closing transactions
|
| Fri, 19 Apr 2019 10:32:32 -0700 |
Martin von Zweigbergk |
evolve: use context manager for transactions
|
| Fri, 19 Apr 2019 10:52:16 -0700 |
Martin von Zweigbergk |
evolve: use consistent message and just re-raise InterventionRequired
|
| Fri, 19 Apr 2019 10:47:12 -0700 |
Martin von Zweigbergk |
evolve: use standard InterventionRequired instead of MergeFailure
|
| Fri, 19 Apr 2019 10:41:56 -0700 |
Martin von Zweigbergk |
evolve: don't use exception for local flow control
|
| Tue, 23 Apr 2019 11:02:08 -0700 |
Martin von Zweigbergk |
evolve: reduce indentation with an early return statement
|
| Tue, 23 Apr 2019 11:01:44 -0700 |
Martin von Zweigbergk |
evolve: remove a useless return statement at end of function
|
| Sun, 21 Apr 2019 13:04:40 +0530 |
Sushil khanchi |
test: move a test to an appropriate test file
|
| Sun, 21 Apr 2019 12:07:26 +0530 |
Sushil khanchi |
test: improve the title of a test
|
| Sun, 21 Apr 2019 12:06:31 +0530 |
Sushil khanchi |
test: remove duplicated test
|
| Sat, 09 Mar 2019 19:35:45 +0530 |
Sushil khanchi |
evolve: warn user for the metadata being lost in public divergence resolution
|
| Wed, 17 Apr 2019 21:16:17 +0530 |
Sushil khanchi |
evolve: show a status message when merging leads to public cset
|
| Wed, 24 Apr 2019 20:32:01 +0200 |
Pierre-Yves David |
test: use a shorter test name
|
| Wed, 10 Apr 2019 18:20:33 +0800 |
Anton Shestakov |
stack: rename troubledcount to unstablecount
|
| Wed, 24 Apr 2019 17:21:21 +0800 |
Anton Shestakov |
evolve: use --all by default (BC)
|
| Wed, 24 Apr 2019 17:02:27 +0800 |
Anton Shestakov |
tests: add --rev to hg evolve to reduce test changes for the next patch
|
| Wed, 24 Apr 2019 16:35:01 +0800 |
Anton Shestakov |
tests: add --no-all to hg evolve to reduce test changes
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
| Sun, 14 Apr 2019 02:18:19 +0800 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
| Wed, 24 Apr 2019 15:57:49 +0200 |
Anton Shestakov |
tests: don't create a nested repo for no reason
|
| Wed, 24 Apr 2019 14:38:26 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Tue, 23 Apr 2019 15:57:04 +0200 |
Pierre-Yves David |
Added tag 8.5.1 for changeset 05c9dcf5512e
stable
|
| Tue, 23 Apr 2019 15:30:39 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.1
stable 8.5.1
|
| Tue, 23 Apr 2019 14:18:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Tue, 23 Apr 2019 14:18:11 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
| Tue, 23 Apr 2019 14:18:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Tue, 23 Apr 2019 14:18:08 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Tue, 23 Apr 2019 14:18:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Tue, 23 Apr 2019 14:18:05 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
| Mon, 22 Apr 2019 22:14:26 -0700 |
Martin von Zweigbergk |
evolve: fix progress display with hg<4.7
stable
|
