This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8151

relnotes: move entry to the right spot
ClosedPublic

Authored by valentin.gatienbaron on Feb 26 2020, 10:57 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGefd73cdcfbac: relnotes: move entry to the right spot
Summary

It appears a conflict resolution went wrong.

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

pulkit accepted this revision.Feb 27 2020, 2:39 AM
This revision is now accepted and ready to land.Feb 27 2020, 2:39 AM
valentin.gatienbaron added a commit: rHGefd73cdcfbac: relnotes: move entry to the right spot.Feb 27 2020, 3:11 AM
Closed by commit rHGefd73cdcfbac: relnotes: move entry to the right spot (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrelnotes/next (4 lines)

Diff 20352

relnotes/next

* `hg copy` now supports a `--at-rev` argument to mark files as * `hg copy` now supports a `--at-rev` argument to mark files as
copied in the specified commit. It only works with `--after` for copied in the specified commit. It only works with `--after` for
now (i.e., it's only useful for marking files copied using non-hg now (i.e., it's only useful for marking files copied using non-hg
`cp` as copied). `cp` as copied).
* Use `hg copy --forget --at-rev REV` to unmark already committed * Use `hg copy --forget --at-rev REV` to unmark already committed
copies. copies.
* prevent pushes of divergent bookmarks (foo@remote)
== Bug Fixes == == Bug Fixes ==
* Fix server exception when concurrent pushes delete the same bookmark * Fix server exception when concurrent pushes delete the same bookmark
* Prevent pushes of divergent bookmarks (foo@remote)
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
* When `hg rebase` pauses for merge conflict resolution, the working * When `hg rebase` pauses for merge conflict resolution, the working
copy will no longer have the rebased node as a second parent. You copy will no longer have the rebased node as a second parent. You
can use the new `conflictparents()` revset for finding the other can use the new `conflictparents()` revset for finding the other
parent during a conflict. parent during a conflict.
* `hg recover` does not verify the validity of the whole repository * `hg recover` does not verify the validity of the whole repository