next
77 lines
| 2.7 KiB
| text/plain
|
TextLexer
/ relnotes / next
|
r42457 | == New Features == | ||
|
r44771 | * `hg purge`/`hg clean` can now delete ignored files instead of | ||
untracked files, with the new -i flag. | ||||
|
r42500 | |||
|
r44819 | * `hg log` now defaults to using an '%' symbol for commits involved | ||
in unresolved merge conflicts. That includes unresolved conflicts | ||||
caused by e.g. `hg update --merge` and `hg graft`. '@' still takes | ||||
precedence, so what used to be marked '@' still is. | ||||
* New `conflictlocal()` and `conflictother()` revsets return the | ||||
|
r44817 | commits that are being merged, when there are conflicts. Also works | ||
for conflicts caused by e.g. `hg graft`. | ||||
|
r44844 | * `hg copy --forget` can be used to unmark a file as copied. | ||
r44875 | * The `format.revlog-compression` configuration entry now accept a list. The | |||
first available option will be used. for example setting:: | ||||
[format] | ||||
revlog-compression=zstd, zlib | ||||
Will use `zstd` compression for new repositories is available, and will | ||||
simply fall back to `zlib` if not. | ||||
|
r44880 | * `hg debugmergestate` output is now templated, which may be useful | ||
e.g. for IDEs that want to help the user resolve merge conflicts. | ||||
|
r44847 | == New Experimental Features == | ||
|
r44817 | |||
|
r44847 | * `hg copy` now supports a `--at-rev` argument to mark files as | ||
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 | ||||
`cp` as copied). | ||||
|
r42500 | |||
|
r44845 | * Use `hg copy --forget --at-rev REV` to unmark already committed | ||
copies. | ||||
|
r42457 | == Bug Fixes == | ||
|
r44852 | * Fix server exception when concurrent pushes delete the same bookmark | ||
|
r42457 | |||
|
r44876 | * Prevent pushes of divergent bookmarks (foo@remote) | ||
|
r44896 | * The push error "remote repository changed while pushing - please | ||
try again" now only happens when a concurrent push changed related | ||||
heads (instead of when a concurrent pushed any revision). | ||||
|
r42457 | == Backwards Compatibility Changes == | ||
|
r44821 | * When `hg rebase` pauses for merge conflict resolution, the working | ||
copy will no longer have the rebased node as a second parent. You | ||||
can use the new `conflictparents()` revset for finding the other | ||||
parent during a conflict. | ||||
|
r44851 | * `hg recover` does not verify the validity of the whole repository | ||
anymore. You can pass `--verify` or call `hg verify` if necessary. | ||||
|
r43214 | |||
|
r44880 | * `hg debugmergestate` output format changed. Let us know if that is | ||
causing you problems and we'll roll it back. | ||||
|
r42457 | == Internal API Changes == | ||
|
r44619 | * The deprecated `ui.progress()` has now been deleted. Please use | ||
`ui.makeprogress()` instead. | ||||
|
r44639 | |||
* `hg.merge()` has lost its `abort` argument. Please call | ||||
`hg.abortmerge()` directly instead. | ||||
|
r44655 | |||
|
r44882 | * `hg.merge()` has lost its `mergeforce` argument. It should have | ||
only ever been called with the same value as the `force` argument. | ||||
|
r44655 | * The `*others` argument of `cmdutil.check_incompatible_arguments()` | ||
changed from being varargs argument to being a single collection. | ||||