Re: [RFC] Looking at multiple ancestors in merge

From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Aug 25, 2005, 06:56 UTC
Message-ID: <pan.2005.08.25.06.56.22.883900@smurf.noris.de>
In-Reply-To: <Pine.LNX.4.63.0508250108100.23242@iabervon.org>

Hi, Daniel Barkalow wrote:

> My proposal is actually to detect when a merge is ambiguous. In order to
> determine that, however, you have to evaluate multiple potential outcomes
> and see if they are actually different. I'm working on an efficient way to
> do that.

Good.

There's also a related problem which I've hit last month or so, where one view has the same file (or at least one with the same name) added to both sides of the branch, but the other view doesn't.

Unfortunately, that can happen to both branches independently, so you really need to choose a merge base per file instead of globally. I suspect that many of the problem cases simply go away when you do that.

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
Jones' Second Law:
	The man who smiles when things go wrong has thought of someone
	to blame it on.