4 commits

Author	SHA1	Message	Date
Martin von Zweigbergk	6d61475f66	merge: use recursive merge when there are multiple common ancestors	2021-05-15 14:05:34 -07:00
Martin von Zweigbergk	c3b9d1cd13	rewrite: take a MutableRepo instead of a Transaction	2021-03-16 22:05:51 -07:00
Martin von Zweigbergk	2a531832d6	rewrite: make merge_commit_trees() use index for finding common ancestors ... The index is now always kept up to date and it has functionality for finding common ancestors, so let's use it! This should make merging commits a little faster if their common ancestor is far away (which is rare). It's probably much more important that the index-based algorithm is more correct. Also, it returns multiple common ancestors in the criss-cross case, which lets us do a recursive merge like git does. I'm leaving the recursive merge for later, though.	2021-02-23 20:49:18 -08:00
Martin von Zweigbergk	6b1427cb46	import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo	2020-12-12 00:23:38 -08:00