This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9944

relnotes: add entry for `hg diff --merge -c`
ClosedPublic

Authored by durin42 on Feb 1 2021, 5:13 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG6b847757dd8d: relnotes: add entry for `hg diff --merge -c`

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Feb 1 2021, 5:13 PM
martinvonz accepted this revision.Feb 1 2021, 5:48 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
relnotes/next
8–11

I'll move this to the next section in flight

This revision is now accepted and ready to land.Feb 1 2021, 5:48 PM
durin42 added a commit: rHG6b847757dd8d: relnotes: add entry for `hg diff --merge -c`.Feb 1 2021, 5:52 PM
Closed by commit rHG6b847757dd8d: relnotes: add entry for `hg diff --merge -c` (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrelnotes/next (5 lines)

Diff 25452

relnotes/next

== New Features == == New Features ==
* `hg purge` is now a core command using `--confirm` by default. * `hg purge` is now a core command using `--confirm` by default.
* The `rev-branch-cache` is now updated incrementally whenever changesets * The `rev-branch-cache` is now updated incrementally whenever changesets
are added. are added.
== New Experimental Features == == New Experimental Features ==
* `hg diff` now takes an experimental `--merge` flag which causes `hg
martinvonzUnsubmitted
Not Done

I'll move this to the next section in flight

martinvonz: I'll move this to the next section in flight
diff --change` to show the changes relative to an automerge for
merge changesets. This makes it easier to detect and review manual
changes performed in merge changesets.
== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
== Internal API Changes == == Internal API Changes ==
* `changelog.branchinfo` is deprecated and will be removed after 5.8. * `changelog.branchinfo` is deprecated and will be removed after 5.8.
It is superseded by `changelogrevision.branchinfo`. It is superseded by `changelogrevision.branchinfo`.