Mercurial > hg-stable

view relnotes/next @ 44377:8561ad49915d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: add a revset for parents in merge state This may be particularly useful soon, when I'm going to change how `hg rebase` sets its parents during conflict resolution. Differential Revision: https://phab.mercurial-scm.org/D8041
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 29 Jan 2020 11:30:35 -0800
parents 9f8eddd2723f
children 14d0e89520a2
line wrap: on
line source

== New Features ==

 * `hg purge`/`hg clean` can now delete ignored files instead of
   untracked files, with the new -i flag.

 * New `conflictlocal()` and `conflictother()` revsets returns the
   commits that are being merged, when there are conflicts. Also works
   for conflicts caused by e.g. `hg graft`.


== New Experimental Features ==


== Bug Fixes  ==


== Backwards Compatibility Changes ==


== Internal API Changes ==

 * The deprecated `ui.progress()` has now been deleted. Please use
   `ui.makeprogress()` instead.

 * `hg.merge()` has lost its `abort` argument. Please call
   `hg.abortmerge()` directly instead.

 * The `*others` argument of `cmdutil.check_incompatible_arguments()`
   changed from being varargs argument to being a single collection.