This is an archive of the discontinued Mercurial Phabricator instance.

Strictly speaking, yes it does, but like the other changeset, the nature of that bug is rather esoteric, and I discovered it by reading the code: If you back out a commit already backed out, and set the time (and so on) such that the resulting commit already existed, and is not tip, the output will be wrong. With an unchanging date, you cannot assume that the result of commit is always tip.

Dan Villiom Podlaski Christiansen <danchr@gmail.com> added a commit: rHGe0ad11ab8052: backout: don't assume that tip as what we just committed.Oct 29 2020, 3:22 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (4 lines)
M			tests/test-backout.t (15 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23317		Oct 28 2020, 9:06 PM	★	★
Diff 2	23348	rHGfc06f59f08722d47d71ad0616cf35239554be434	Oct 28 2020, 12:41 PM	★	★
Diff 3	23352		Oct 29 2020, 3:03 AM	★	★

Commit	Parents	Author	Summary	Date
59a9b86aee05	8ed69bd42f10	Dan Villiom Podlaski Christiansen		Oct 28 2020, 12:41 PM

	Status	Author	Revision
	Closed	danchr	D9253 commit: don't change phases for preexisting commits
	Closed	danchr	D9256 backout: don't assume that tip as what we just committed

Diff 23352

mercurial/commands.py

	return 1			return 1
	cmdutil.commitstatus(repo, newnode, branch, bheads)			cmdutil.commitstatus(repo, newnode, branch, bheads)

	def nice(node):			def nice(node):
	return b'%d:%s' % (repo.changelog.rev(node), short(node))			return b'%d:%s' % (repo.changelog.rev(node), short(node))

	ui.status(			ui.status(
	_(b'changeset %s backs out changeset %s\n')			_(b'changeset %s backs out changeset %s\n')
	% (nice(repo.changelog.tip()), nice(node))			% (nice(newnode), nice(node))
	)			)
	if opts.get(b'merge') and op1 != node:			if opts.get(b'merge') and op1 != node:
	hg.clean(repo, op1, show_stats=False)			hg.clean(repo, op1, show_stats=False)
	ui.status(			ui.status(
	_(b'merging with changeset %s\n') % nice(repo.changelog.tip())			_(b'merging with changeset %s\n') % nice(newnode)
	)			)
	overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}			overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
	with ui.configoverride(overrides, b'backout'):			with ui.configoverride(overrides, b'backout'):
	return hg.merge(repo[b'tip'])			return hg.merge(repo[b'tip'])
	return 0			return 0


	@command(			@command(

tests/test-backout.t

	changeset cccc23d9d68f backed out, don't forget to commit.			changeset cccc23d9d68f backed out, don't forget to commit.
	$ hg revert -aq			$ hg revert -aq

	--no-commit can't be used with --merge			--no-commit can't be used with --merge

	$ hg backout --merge --no-commit 2			$ hg backout --merge --no-commit 2
	abort: cannot specify both --no-commit and --merge			abort: cannot specify both --no-commit and --merge
	[255]			[255]

				Ensure that backout out the same changeset twice performs correctly:

				$ hg backout 2
				removing 3
				changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f
				$ echo 4 > 4
				$ hg ci -A -m 4
				adding 4
				$ hg up 2
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg backout 2
				removing 3
				created new head
				changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f

This is an archive of the discontinued Mercurial Phabricator instance.

backout: don't assume that tip as what we just committedClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23352

mercurial/commands.py

tests/test-backout.t

backout: don't assume that tip as what we just committed
ClosedPublic

Revision Contents
Changeset List