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