[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1739263 - /subversion/branches/1.9.x/STATUS

From: Philip Martin <philip_at_codematters.co.uk>
Date: Thu, 21 Apr 2016 10:57:34 +0100

Stefan Sperling <stsp_at_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/%3CBLUPR0601MB738480182C1642DE3B2EAA385A80@BLUPR0601MB738.namprd06.prod.outlook.com%3E

-- 
Philip
Received on 2016-04-21 11:57:41 CEST

This is an archived mail posted to the Subversion Dev mailing list.