Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (athena.apache.org: local policy)
Date: Tue, 12 Jun 2012 23:00:04 +0200
From: Stefan Sperling <stsp@elego.de>
To: Glenn Holmer <gholmer@weycogroup.com>
Cc: users@subversion.apache.org
Subject: Re: commit mergeinfo?
Message-ID: <20120612210004.GB16835@ted.stsp.name>
Mail-Followup-To: Glenn Holmer <gholmer@weycogroup.com>,
	users@subversion.apache.org
References: <1339519156.19636.158.camel@shadow>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1339519156.19636.158.camel@shadow>
User-Agent: Mutt/1.5.21 (2010-09-15)

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