On Tue, 2012-06-12 at 23:00 +0200, Stefan Sperling wrote:
> 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_at_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.
That's what we thought; in fact, I found the commit of the mergeinfo
from the previous trunk-to-branch merge in the history after I posted.
We upgraded from 1.5 to 1.6 fairly recently, and had a lot of pain with
merges in 1.5; we're still a little skittish about it.
Weyco Group, Inc.
Received on 2012-06-12 23:13:45 CEST