| Tue, 18 Jan 2022 14:57:15 -0800 |
Martin von Zweigbergk |
rebase: set custom conflict label for base commit
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
file |
diff |
annotate
|
| Thu, 18 Mar 2021 18:24:59 -0400 |
Matt Harbison |
merge with stable
|
file |
diff |
annotate
|
| Thu, 04 Mar 2021 17:35:58 +0530 |
Pulkit Goyal |
commit: reorder if-else conditional to give mergestate info priority
stable
|
file |
diff |
annotate
|
| Fri, 15 Jan 2021 01:58:59 +0100 |
Joerg Sonnenberger |
branchmap: update rev-branch-cache incrementally
|
file |
diff |
annotate
|
| Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
file |
diff |
annotate
|
| Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
file |
diff |
annotate
|
| Wed, 21 Oct 2020 19:00:16 -0700 |
Martin von Zweigbergk |
errors: add config that lets user get more detailed exit codes
|
file |
diff |
annotate
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
file |
diff |
annotate
|
| Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 17:46:10 -0800 |
Martin von Zweigbergk |
tests: add test of rebase with conflict in merge commit
|
file |
diff |
annotate
|
| Wed, 11 Sep 2019 15:03:08 -0700 |
Martin von Zweigbergk |
bundle2: fix an off-by-one in debug message of number of parts
|
file |
diff |
annotate
|
| Sun, 08 Sep 2019 09:42:53 +0200 |
Pierre-Yves David |
changegroup: move message about added changes to transaction summary
|
file |
diff |
annotate
|
| Sun, 14 Jul 2019 23:21:28 -0700 |
Martin von Zweigbergk |
py3: fix formatting of branchmap log messages with repo.filtername=None
|
file |
diff |
annotate
|
| Sun, 09 Jun 2019 02:12:58 +0530 |
Taapas Agrawal |
statecheck: added support for STATES
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 21:41:51 -0700 |
Martin von Zweigbergk |
copies: delete debug message about changes since common ancestor
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
file |
diff |
annotate
|
| Thu, 04 Apr 2019 13:58:49 +0200 |
Pierre-Yves David |
repoview: keep the branchmap cache for the `served.hidden` view warm
|
file |
diff |
annotate
|
| Thu, 30 Aug 2018 01:53:21 +0200 |
Boris Feld |
phase: report number of non-public changeset alongside the new range
|
file |
diff |
annotate
|
| Wed, 13 Jun 2018 22:50:32 +0530 |
Pulkit Goyal |
morestatus: remove some extra spaces
|
file |
diff |
annotate
|
| Tue, 08 May 2018 14:17:46 -0700 |
Boris Feld |
bundle2: mark the bundle2 part as advisory (issue5872)
stable
|
file |
diff |
annotate
|
| Tue, 03 Apr 2018 13:56:09 -0700 |
Gregory Szorc |
tests: use `hg unbundle` instead of `hg pull` in some tests
|
file |
diff |
annotate
|
| Tue, 03 Apr 2018 18:20:10 -0700 |
Gregory Szorc |
tests: remove superfluous config setting
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 11:01:19 -0700 |
Martin von Zweigbergk |
rebase: store rebase state after each commit
|
file |
diff |
annotate
|
| Thu, 18 Jan 2018 15:10:22 +0100 |
Boris Feld |
revbranchcache: advertise and use 'rbc' exchange capability
|
file |
diff |
annotate
|
| Wed, 21 Feb 2018 17:33:00 +0100 |
Boris Feld |
bundle: include advisory rev branch cache part in bundle2 bundle
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 22:39:46 -0800 |
Phil Cohen |
tests: add a simple test for in-memory rebase
|
file |
diff |
annotate
|
| Tue, 17 Oct 2017 11:29:26 +0200 |
Boris Feld |
config: replace experimental.stabilization by experimental.evolution
|
file |
diff |
annotate
|