| 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
|
| Thu, 12 Oct 2017 09:39:50 +0200 |
Denis Laxalde |
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:38:34 -0700 |
Jun Wu |
rebase: remove messages for nullmerge and revignored (BC)
|
file |
diff |
annotate
|
| Fri, 04 Aug 2017 18:41:16 +0200 |
Boris Feld |
test: update evolution config
|
file |
diff |
annotate
|
| Thu, 03 Aug 2017 05:12:35 +0530 |
Pulkit Goyal |
morestatus: move fb extension to core by plugging to `hg status --verbose`
|
file |
diff |
annotate
|
| Fri, 07 Jul 2017 18:51:46 -0700 |
Jun Wu |
rebase: use scmutil.cleanupnodes (issue5606) (BC)
|
file |
diff |
annotate
|
| Thu, 29 Jun 2017 15:21:52 -0700 |
Martin von Zweigbergk |
merge with stable
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 17:40:24 +0200 |
Pierre-Yves David |
rebase: backed out changeset cf8ad0e6c0e4 (issue5610)
stable
|
file |
diff |
annotate
|
| Sat, 24 Jun 2017 10:31:41 -0700 |
Jun Wu |
test-rebase-conflicts: add a test case about turning obsstore on and off
|
file |
diff |
annotate
|
| Thu, 15 Jun 2017 00:15:52 -0700 |
Martin von Zweigbergk |
strip: include phases in bundle (BC)
|
file |
diff |
annotate
|
| Tue, 02 May 2017 18:57:52 +0200 |
Pierre-Yves David |
caches: stop warming the cache after changegroup application
|
file |
diff |
annotate
|
| Tue, 02 May 2017 22:27:44 +0200 |
Pierre-Yves David |
caches: move the 'updating the branch cache' message in 'updatecaches'
|
file |
diff |
annotate
|
| Thu, 11 May 2017 22:38:15 -0700 |
Martin von Zweigbergk |
rebase: rename "target" to "destination" in messages
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 16:27:32 -0800 |
Durham Goode |
rebase: move actual rebase into a single transaction
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 16:30:31 -0800 |
Durham Goode |
rebase: allow aborting if last-message.txt is missing
|
file |
diff |
annotate
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
file |
diff |
annotate
|
| Wed, 02 Nov 2016 18:59:29 +0000 |
timeless |
rebase: check for conflicts before continuing
|
file |
diff |
annotate
|
| Fri, 14 Oct 2016 01:31:11 +0200 |
Pierre-Yves David |
changegroup: skip delta when the underlying revlog do not use them
|
file |
diff |
annotate
|
| Thu, 13 Oct 2016 02:19:43 +0200 |
Gábor Stefanik |
mergecopies: invoke _computenonoverlap for both base and tca during merges
|
file |
diff |
annotate
|
| Tue, 20 Sep 2016 23:48:08 +0000 |
timeless |
localrepo: use single quotes in use warning
|
file |
diff |
annotate
|
| Tue, 13 Sep 2016 13:49:42 -0700 |
Martin von Zweigbergk |
rebase: make debug logging more consistent
|
file |
diff |
annotate
|
| Mon, 08 Aug 2016 22:06:07 -0700 |
Gregory Szorc |
changegroup: move branch cache debug message to proper location
|
file |
diff |
annotate
|
| Mon, 18 Jul 2016 22:25:09 +0200 |
Mads Kiilerich |
rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount
stable
|
file |
diff |
annotate
|
| Sun, 17 Jul 2016 15:13:51 -0700 |
Gregory Szorc |
bundle2: store changeset count when creating file bundles
|
file |
diff |
annotate
|
| Wed, 10 Feb 2016 09:06:08 -0800 |
Ryan McElroy |
merge: minimize conflicts when common base is not shown (issue4447)
|
file |
diff |
annotate
|
| Thu, 24 Dec 2015 20:41:40 +0000 |
timeless |
rebase: hook afterresolvedstates
|
file |
diff |
annotate
|
| Tue, 20 Oct 2015 03:14:36 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-rebase-conflict.t'
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Wed, 01 Jul 2015 16:33:31 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 29 Jun 2015 11:20:09 -0700 |
Pierre-Yves David |
changegroup: properly compute common base in changeggroupsubset (issue4736)
stable
|
file |
diff |
annotate
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
file |
diff |
annotate
|