On Tue, Jun 12, 2012 at 11:39:16AM -0500, Glenn Holmer wrote: > We're on Subversion 1.6. After creating a branch, we merged from trunk > to branch three times. After the third merge, we noticed an > svn:mergeinfo property on the top directory of the branch: > > glennh@shadow:/mnt/sdb1/netbeans-branches/ICE-3.0.1 > svn diff --depth empty . > > Property changes on: . > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /phoenix-jee6/trunk:r17676-17689 > > We're not sure if this was there after previous merges from the trunk or > not. Should this property be committed before doing any more merges?
Yes! It should be committed along with the merged changes. See this section of the svnbook for details: http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.mergeinfo
