Mercurial > public > mercurial-scm > hg-stable

annotate relnotes/next @ 50018:2282d8ac0fa9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add union-other-first as internal merge tool See inline documentation for details.
author C?dric Krier <ced@b2ck.com>
date Thu, 26 Jan 2023 00:23:07 +0100
parents 18282cf18aa2
children 8a65b43457ab
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
48803
f0081a551f37 relnotes: add 6.1
Rapha?l Gom?s <rgomes@octobus.net>
parents: 48691
diff changeset
1 = Mercurial XXX =
f0081a551f37 relnotes: add 6.1
Rapha?l Gom?s <rgomes@octobus.net>
parents: 48691
diff changeset
2
42298
0ed293a3f00e releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
3 == New Features ==
48254
4d2ab365699e bookmarks: move the `mirror` option to the `paths` section
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 47882
diff changeset
4
50018
2282d8ac0fa9 filemerge: add union-other-first as internal merge tool
C?dric Krier <ced@b2ck.com>
parents: 49726
diff changeset
5 * There is a new internal merge tool called `internal:union-other-first`.
2282d8ac0fa9 filemerge: add union-other-first as internal merge tool
C?dric Krier <ced@b2ck.com>
parents: 49726
diff changeset
6 It works like `internal:union` but add other side on top of local.
2282d8ac0fa9 filemerge: add union-other-first as internal merge tool
C?dric Krier <ced@b2ck.com>
parents: 49726
diff changeset
7
46999
035c06f9fddf relnode: document the move to `zstd` as default compression
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46998
diff changeset
8 == 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
9
48803
f0081a551f37 relnotes: add 6.1
Rapha?l Gom?s <rgomes@octobus.net>
parents: 48691
diff changeset
10 These changes affect newly created repositories (or new clones) done with
f0081a551f37 relnotes: add 6.1
Rapha?l Gom?s <rgomes@octobus.net>
parents: 48691
diff changeset
11 Mercurial XXX.
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
12
44401
9dab3fa64325 copy: add experimental support for marking committed copies
Martin von Zweigbergk <martinvonz@google.com>
parents: 44399
diff changeset
13 == New Experimental Features ==
44377
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 44335
diff changeset
14
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
15 == 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
16
42298
0ed293a3f00e releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
17 == Backwards Compatibility Changes ==
0ed293a3f00e releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
18
0ed293a3f00e releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
19 == Internal API Changes ==
0ed293a3f00e releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
20
48803
f0081a551f37 relnotes: add 6.1
Rapha?l Gom?s <rgomes@octobus.net>
parents: 48691
diff changeset
21 == Miscellaneous ==
49725
53e4f44ba0e8 configitems: enable pullbundles by default
Mathias De Mare <mathias.de_mare@nokia.com>
parents: 49453
diff changeset
22
53e4f44ba0e8 configitems: enable pullbundles by default
Mathias De Mare <mathias.de_mare@nokia.com>
parents: 49453
diff changeset
23 * pullbundle support no longer requires setting a server-side option,
53e4f44ba0e8 configitems: enable pullbundles by default
Mathias De Mare <mathias.de_mare@nokia.com>
parents: 49453
diff changeset
24 providing a .hg/pullbundles.manifest according to the syntax specified in
53e4f44ba0e8 configitems: enable pullbundles by default
Mathias De Mare <mathias.de_mare@nokia.com>
parents: 49453
diff changeset
25 'hg help -e clonebundles' is enough.