author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Tue, 11 Jan 2022 21:40:08 +0100 | |
changeset 48669 | 7ee07e1a25c0 |
parent 48594 | b128d21cbe8b |
child 48804 | f0081a551f37 |
permissions | -rw-r--r-- |
42271
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
1 |
== New Features == |
48242
4d2ab365699e
bookmarks: move the `mirror` option to the `paths` section
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48017
diff
changeset
|
2 |
|
46254
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
46237
diff
changeset
|
3 |
|
46999
035c06f9fddf
relnode: document the move to `zstd` as default compression
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46998
diff
changeset
|
4 |
== Default Format Change == |
035c06f9fddf
relnode: document the move to `zstd` as default compression
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46998
diff
changeset
|
5 |
|
035c06f9fddf
relnode: document the move to `zstd` as default compression
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46998
diff
changeset
|
6 |
These changes affects newly created repositories (or new clone) done with |
48669
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
7 |
Mercurial 6.1. |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
8 |
|
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
9 |
The `share-safe` format variant is now enabled by default. It makes |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
10 |
configuration and requirements more consistent across repository and their |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
11 |
shares. This introduces a behavior change as shares from a repository using the |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
12 |
new format will also use their main repository's configuration. |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
13 |
|
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
14 |
See `hg help config.format.use-share-safe` for details about the feature and |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
15 |
the available options for auto-upgrading existing shares. |
46999
035c06f9fddf
relnode: document the move to `zstd` as default compression
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46998
diff
changeset
|
16 |
|
47000
c3eee5ad1de9
relnote: document the use of persistent-nodemap by default for Rust build
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46999
diff
changeset
|
17 |
|
44367
9dab3fa64325
copy: add experimental support for marking committed copies
Martin von Zweigbergk <martinvonz@google.com>
parents:
44365
diff
changeset
|
18 |
== New Experimental Features == |
44343
8561ad49915d
revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents:
44289
diff
changeset
|
19 |
|
45191
fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release
Manuel Jacob <me@manueljacob.de>
parents:
45190
diff
changeset
|
20 |
== Bug Fixes == |
fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release
Manuel Jacob <me@manueljacob.de>
parents:
45190
diff
changeset
|
21 |
|
48407
4d59e0f909e0
update: properly overwrite `check` config with `--no-` variants
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48302
diff
changeset
|
22 |
The `--no-check` and `--no-merge` now properly overwrite the behavior from `commands.update.check`. |
45189
045f5361bd12
relnotes: make spacing before new section consistent
Manuel Jacob <me@manueljacob.de>
parents:
45169
diff
changeset
|
23 |
|
42271
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
24 |
== Backwards Compatibility Changes == |
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
25 |
|
48549
28f0092ec89f
exchange: add fast path for subrepo check on push
Joerg Sonnenberger <joerg@bec.de>
parents:
48407
diff
changeset
|
26 |
The remotefilelog extension now requires an appropiate excludepattern |
28f0092ec89f
exchange: add fast path for subrepo check on push
Joerg Sonnenberger <joerg@bec.de>
parents:
48407
diff
changeset
|
27 |
for subrepositories. |
44396
acbfa31cfaf2
debugmergestate: make templated
Martin von Zweigbergk <martinvonz@google.com>
parents:
44392
diff
changeset
|
28 |
|
48587
3c8cc987672e
simplemerge: take over formatting of label from `filemerge`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48549
diff
changeset
|
29 |
The labels passed to merge tools have changed slightly. Merge tools can get |
3c8cc987672e
simplemerge: take over formatting of label from `filemerge`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48549
diff
changeset
|
30 |
labels passed to them if you include `$labellocal`, `$labelbase`, and/or |
3c8cc987672e
simplemerge: take over formatting of label from `filemerge`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48549
diff
changeset
|
31 |
`$labelother` in the `merge-tool.<tool name>.args` configuration. These labels |
3c8cc987672e
simplemerge: take over formatting of label from `filemerge`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48549
diff
changeset
|
32 |
used to have some space-padding, and truncation to fit within 72 columns. Both |
3c8cc987672e
simplemerge: take over formatting of label from `filemerge`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48549
diff
changeset
|
33 |
the padding and the truncation has been removed. |
3c8cc987672e
simplemerge: take over formatting of label from `filemerge`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48549
diff
changeset
|
34 |
|
48594
b128d21cbe8b
relnotes: add note about changed labels texts
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
35 |
Some of the text in labels passed to merge tools has changed. For example, |
b128d21cbe8b
relnotes: add note about changed labels texts
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
36 |
in conflicts while running `hg histedit`, the labels used to be "local", |
b128d21cbe8b
relnotes: add note about changed labels texts
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
37 |
"base", and "histedit". They are now "already edited", |
b128d21cbe8b
relnotes: add note about changed labels texts
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
38 |
"parent of current change", and "current change", respectively. |
b128d21cbe8b
relnotes: add note about changed labels texts
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
39 |
|
48669
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
40 |
The use of `share-safe`, means shares (of new repositories) will also use their |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
41 |
main repository's configuration see the `Default Format Change` section |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
42 |
for details. |
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48594
diff
changeset
|
43 |
|
42271
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
44 |
== Internal API Changes == |
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
45 |
|
47978 | 46 |
The following functions have been removed: |
47758
ec77f709495c
relnotes: document the change in the dirstate API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47071
diff
changeset
|
47 |
|
47978 | 48 |
Miscellaneous: |