On 13.05.2012 13:50, Bert Huijben wrote:
>> -----Original Message-----
>> From: stsp_at_apache.org [mailto:stsp_at_apache.org]
>> Sent: zondag 13 mei 2012 13:07
>> To: commits_at_subversion.apache.org
>> Subject: svn commit: r1337844 -
>> /subversion/trunk/subversion/libsvn_wc/conflicts.c
>>
>> Author: stsp
>> Date: Sun May 13 11:06:29 2012
>> New Revision: 1337844
>>
>> URL: http://svn.apache.org/viewvc?rev=1337844&view=rev
>> Log:
>> * subversion/libsvn_wc/conflicts.c
>> (resolve_conflict_on_node): Restore pre-r1337579 behaviour of setting the
>> did_resolve output parameter to FALSE if a text conflict was implicitly
>> resolved by removing the conflict marker files. Apparently this is a
>> "feature" we want to keep... *grumble*
> +1 on the sentiment.
If we were allowed to remove stupid features, I'd vote for killing
copies-are-branches much sooner than this one. :)
-- Brane
Received on 2012-05-14 16:22:07 CEST