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

Re: merge using same revision number - quick question

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 24 Apr 2013 16:30:31 -0400

On Wed, Apr 24, 2013 at 4:25 PM, Z W <mpc8250_at_gmail.com> wrote:

> Hi Bob, we're still seeing the problem of unwanted touches of files and
> directories on new unmerged rev numbers, even after we reapply all merges
> for all previous already-merged at feature branch root level.
> We're getting concerned now, wondering if we misunderstood the explanations
> here.
> We're using SVN 1.6

When you do a merge with an SVN 1.6 client, all paths beneath the
merge target that have the svn:mergeinfo property set on them will be
"touched" by the merge. Something about the mergeinfo on those items
will always be changed. Usually it will just be adding the revisions
merged to the ranges stored in the properties.

With an SVN 1.7 client, merge will only update the mergeinfo for paths
that were affected by the merge.

I have not followed the thread, but you can probably remove the
svn:mergeinfo property from these files and just start to be sure you
only do all future merges from the root of the tree.

Mark Phippard
Received on 2013-04-24 22:31:04 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.