Stefan Sperling <s...@elego.de> writes: > Funny. It works with 1.9.x indeed. > > Now try the same with a trunk client. > Is this a regression? Or a new feature?
This is caused by the deliberate change, r1739263, to the way our merge algorithm handles adjacent changes. 2003 discussion about merging without a conflict: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=35014 2016 discussion about raising a conflict: https://mail-archives.apache.org/mod_mbox/subversion-dev/201602.mbox/%3c87wppw3bgz.fsf...@wandisco.com%3E A clean merge is "correct" in my example from 2003 and for this backport proposal. In other cases a conflict is better see the user report that lead to the r1739263 change: https://mail-archives.apache.org/mod_mbox/subversion-users/201602.mbox/%3cblupr0601mb738480182c1642de3b2eaa385...@blupr0601mb738.namprd06.prod.outlook.com%3E -- Philip
