Mercurial > hg
annotate relnotes/next @ 46454:6b847757dd8d
relnotes: add entry for `hg diff --merge -c`
Differential Revision: https://phab.mercurial-scm.org/D9944
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 01 Feb 2021 17:13:24 -0500 |
parents | 1c66795862cf |
children | d57e607d9e33 |
rev | line source |
---|---|
42271
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
1 == New Features == |
46453
1c66795862cf
branching: merge with stable
Martin von Zweigbergk <martinvonz@google.com>
diff
changeset
|
2 |
46368
bb3a5c0df06b
purge: move extension into core mercurial
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
46254
diff
changeset
|
3 * `hg purge` is now a core command using `--confirm` by default. |
46453
1c66795862cf
branching: merge with stable
Martin von Zweigbergk <martinvonz@google.com>
diff
changeset
|
4 |
46372
3e91d9978bec
branchmap: update rev-branch-cache incrementally
Joerg Sonnenberger <joerg@bec.de>
parents:
46370
diff
changeset
|
5 * The `rev-branch-cache` is now updated incrementally whenever changesets |
3e91d9978bec
branchmap: update rev-branch-cache incrementally
Joerg Sonnenberger <joerg@bec.de>
parents:
46370
diff
changeset
|
6 are added. |
42271
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
7 |
46254
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
46237
diff
changeset
|
8 |
44367
9dab3fa64325
copy: add experimental support for marking committed copies
Martin von Zweigbergk <martinvonz@google.com>
parents:
44365
diff
changeset
|
9 == New Experimental Features == |
44343
8561ad49915d
revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents:
44289
diff
changeset
|
10 |
46454
6b847757dd8d
relnotes: add entry for `hg diff --merge -c`
Augie Fackler <augie@google.com>
parents:
46453
diff
changeset
|
11 * `hg diff` now takes an experimental `--merge` flag which causes `hg |
6b847757dd8d
relnotes: add entry for `hg diff --merge -c`
Augie Fackler <augie@google.com>
parents:
46453
diff
changeset
|
12 diff --change` to show the changes relative to an automerge for |
6b847757dd8d
relnotes: add entry for `hg diff --merge -c`
Augie Fackler <augie@google.com>
parents:
46453
diff
changeset
|
13 merge changesets. This makes it easier to detect and review manual |
6b847757dd8d
relnotes: add entry for `hg diff --merge -c`
Augie Fackler <augie@google.com>
parents:
46453
diff
changeset
|
14 changes performed in merge changesets. |
6b847757dd8d
relnotes: add entry for `hg diff --merge -c`
Augie Fackler <augie@google.com>
parents:
46453
diff
changeset
|
15 |
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
|
16 |
fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release
Manuel Jacob <me@manueljacob.de>
parents:
45190
diff
changeset
|
17 == 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
|
18 |
fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release
Manuel Jacob <me@manueljacob.de>
parents:
45190
diff
changeset
|
19 |
45189
045f5361bd12
relnotes: make spacing before new section consistent
Manuel Jacob <me@manueljacob.de>
parents:
45169
diff
changeset
|
20 |
42271
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
21 == Backwards Compatibility Changes == |
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
22 |
44396
acbfa31cfaf2
debugmergestate: make templated
Martin von Zweigbergk <martinvonz@google.com>
parents:
44392
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 == Internal API Changes == |
0ed293a3f00e
releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
25 |
46370
cad17d50736c
changelog: move branchinfo to changelogrevision
Joerg Sonnenberger <joerg@bec.de>
parents:
46368
diff
changeset
|
26 * `changelog.branchinfo` is deprecated and will be removed after 5.8. |
cad17d50736c
changelog: move branchinfo to changelogrevision
Joerg Sonnenberger <joerg@bec.de>
parents:
46368
diff
changeset
|
27 It is superseded by `changelogrevision.branchinfo`. |