Re: r1477876 - setting the node kind in a prop conflict description
From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 2 May 2013 09:42:52 +0200
On Wed, May 01, 2013 at 08:32:55PM +0100, Julian Foad wrote:
I don't think I wrote this code originally but I certainly touched
Your patch looks very sensible to me.
> This looks like a simple enough fix (shown below), except I'm dealing with a knock-on effect already so I thought
The obstruction handling dates back to 1.5, I believe.
> If there are any obstruction cases that are reported as conflict kind 'text', then this patch would probably break them. I don't know if there are.
That wouldn't make any sense anyway. They should be tree-conflicts.
This is an archived mail posted to the Subversion Dev mailing list.