| 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
|
