This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D7829 rebase: remove some now-unused parent arguments
Closed	martinvonz	D7828 rebase: remove some redundant setting of dirstate parents
Closed	martinvonz	D7827 rebase: don't use rebased node as dirstate p2 (BC)
Closed	martinvonz	D7826 rebase: stop relying on having two parents to resume rebase
Closed	martinvonz	D8043 graphlog: use '%' for other context in merge conflict
Closed	martinvonz	D8042 tests: add `hg log -G` output when there are merge conflicts
Closed	martinvonz	D8041 revset: add a revset for parents in merge state
Closed	martinvonz	D7825 rebase: delete seemingly unnecessary needupdate()
Closed	martinvonz	D8040 mergestate: add accessors for local and other nodeid, not just contexts
Closed	martinvonz	D7824 tests: add test of rebase with conflict in merge commit
Closed	martinvonz	D7907 rebase: always be graft-like, not merge-like, also for merges
Closed	martinvonz	D7906 rebase: define base in only place in defineparents()
Closed	martinvonz	D7905 rebase: move some variables after an error cases where they're not needed
Closed	martinvonz	D7904 rebase: clarify a little by calculating a set in Python instead of in revset
Closed	martinvonz	D7901 merge: introduce a revert_to() for that use-case
Closed	martinvonz	D7902 merge: introduce a clean_update() for that use-case
Closed	martinvonz	D7900 merge: avoid a negation in the definition of updatedirstate
Closed	martinvonz	D7983 merge: move definition of `partial` closer to where it's used

Diff 19340

	# pick one (so choose p1 above).			# pick one (so choose p1 above).
	if sum(1 for b in set(bases) if b != nullrev) > 1:			if sum(1 for b in set(bases) if b != nullrev) > 1:
	unwanted = [None, None] # unwanted[i]: unwanted revs if choose bases[i]			unwanted = [None, None] # unwanted[i]: unwanted revs if choose bases[i]
	for i, base in enumerate(bases):			for i, base in enumerate(bases):
	if base == nullrev:			if base == nullrev:
	continue			continue
	# Revisions in the side (not chosen as merge base) branch that			# Revisions in the side (not chosen as merge base) branch that
	# might contain "surprising" contents			# might contain "surprising" contents
				other_bases = set(bases) - {base}
	siderevs = list(			siderevs = list(
	repo.revs(b'((%ld-%d) %% (%d+%d))', bases, base, base, dest)			repo.revs(b'(%ld %% (%d+%d))', other_bases, base, dest)
	)			)

	# If those revisions are covered by rebaseset, the result is good.			# If those revisions are covered by rebaseset, the result is good.
	# A merge in rebaseset would be considered to cover its ancestors.			# A merge in rebaseset would be considered to cover its ancestors.
	if siderevs:			if siderevs:
	rebaseset = [			rebaseset = [
	r for r, d in state.items() if d > 0 and r not in obsskipped			r for r, d in state.items() if d > 0 and r not in obsskipped
	]			]