next
39 lines
| 1.2 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`. | ||||
|
r42500 | == New Experimental Features == | ||
|
r42457 | == Bug Fixes == | ||
== 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. | ||||
|
r43214 | |||
|
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 | |||
* The `*others` argument of `cmdutil.check_incompatible_arguments()` | ||||
changed from being varargs argument to being a single collection. | ||||