This is an archive of the discontinued Mercurial Phabricator instance.


	== 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
				anymore. You can pass `--verify` or call `hg verify` if necessary.

	== Internal API Changes ==			== Internal API Changes ==

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

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

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

relnotes: add entry about previous `hg recover` changeClosedPublic