Mon, 27 May 2019 01:53:36 +0200 |
Pierre-Yves David |
obsdiscovery: drop `obshash` discovery protocol (issue6136)
|
Thu, 09 May 2019 09:42:51 -0700 |
Martin von Zweigbergk |
cmdrewrite: use context manager for some locks and transactions
|
Mon, 29 Apr 2019 23:43:16 +0530 |
Sushil khanchi |
evolve: mention that --all is default, in list of options
|
Mon, 13 May 2019 18:47:58 +0530 |
Sushil khanchi |
touch: use util.acceptintervention() for closing the transaction
|
Mon, 13 May 2019 18:45:00 +0530 |
Sushil khanchi |
touch: use context manager for locks
|
Mon, 13 May 2019 18:39:43 +0530 |
Sushil khanchi |
touch: extract the logic of touching rev's to its own function
|
Mon, 27 May 2019 02:42:11 +0200 |
Pierre-Yves David |
changelog: mention user merging in the changelog
|
Sun, 05 May 2019 18:24:59 +0530 |
Sushil khanchi |
evolve: consider using three way merge to get the user for div resolution
|
Sun, 05 May 2019 18:24:50 +0530 |
Sushil khanchi |
evolve: add tests for the case when div csets has different users
|
Fri, 03 May 2019 01:23:12 +0200 |
Pierre-Yves David |
branching: merge with stable
|
Fri, 26 Apr 2019 01:20:08 +0530 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
Fri, 03 May 2019 03:52:44 +0530 |
Faheem Mitha |
debian: Override default value for SPHINXBUILD in docs/makefile
stable
|
Fri, 03 May 2019 03:44:48 +0530 |
Faheem Mitha |
docs: add SPHINXBUILD make variable
stable
|
Sat, 27 Apr 2019 20:56:37 +0530 |
Sushil khanchi |
topic: add test to increase code coverage in case of multiple topics
stable
|
Sat, 27 Apr 2019 17:11:12 +0800 |
Anton Shestakov |
changelog: --no-update is the default, recommend --update instead
|
Sat, 27 Apr 2019 01:18:08 +0300 |
Pulkit Goyal |
topic: drop support for accessing csets in branch stack using bxx (issue6119)
|
Mon, 29 Apr 2019 23:16:29 -0400 |
Matt Harbison |
legacy: drop the check for `obsolete._enabled`
stable
|
Sun, 28 Apr 2019 00:21:28 -0400 |
Matt Harbison |
docs: drop references to the old temporary commit that was created with amend
|
Sat, 27 Apr 2019 22:45:16 -0400 |
Matt Harbison |
templatekw: add `instabilities` alias for `troubles`
|
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
|