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

RE: Is svn branching too difficult?

From: Cufi, Carles <carles.cufi_at_nordicsemi.no>
Date: Tue, 18 May 2010 16:16:00 +0200

Hi there,
 
> Subversion is likely working properly, but yes it is confusing. When
> you do a merge into a branch, Subversion updates its mergeinfo
> tracking on all of the locations that have the property set. There
> have been numerous posts that describe how and why it gets set in the
> first place.

Thanks for the info. As I described in an earlier post, I have a trunk and a branch completely clean of svn:mergeinfo properties and then when I update my branch with the latest trunk a bunch of svn:mergeinfo properties get added to a sparse set of files. All the posts I have read ask people to cleanup all svn:mergeinfo in the trunk and then start branching from it. I have done so but the properties keep reappearing, and this is really confusing for me.

> Because it is confusing, we have changed how Subversion works in the
> next release. It will not update paths that were not modified by the
> merge, and then Subversion was modified to handle the fact that these
> paths do not get their merge tracking information updated.

Excellent! Looking forward to that!

Thanks!

Carles
Received on 2010-05-18 16:16:37 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.