trouble with fast forward merge

[Matt Mackall]

On Thu, Jul 05, 2007 at 11:33:42AM +1000, Bela Babik wrote:
> Hi,
> 
> the new fast forward merge is really handful, but means
> that I can merge as many times as I try and will
> not recognise that I am just creating new empty nodes.

That is a problem.

If the two nodes are cousins, we do a normal merge.

If the current node is an ancestor of the other head, we do a
fast-forward merge.

But if the other head is an ancestor of the current node, there's nothing
to merge - we should abort.

-- 
Mathematics is the supreme nostalgia of our time.