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

RE: Spurious svn:mergeinfo updated on random, untouched files on minimalistic merge?!

From: Geoff Rowell <geoff.rowell_at_gmail.com>
Date: Wed, 31 Mar 2010 08:56:20 -0400

In addition to adding merge info to your working copy target, merge info
will be added to any file or folder under a target folder if the file or
folder already has an "svn:mergeinfo" property. This will happen even if the
original "svn:mergeinfo" property is empty.

The only way to correct this is to consolidate the merge info into the root
folders of a working copy, and its externals, and to *delete* the
"svn:mergeinfo" property from all child folders and files.

To avoid an increasing number of items with this property, as a result of
non-root merges or copies, you would have to restrict setting of the
"svn:mergeinfo" property to a root folder.

The Subversion Hook Framework can be used to enforce this policy.

- http://sourceforge.net/projects/svnhook

There's an example of the required configuration (XML) file entry on the
"Hook Configuration File Examples" page of the wiki.

-
http://sourceforge.net/apps/mediawiki/svnhook/index.php?title=Hook_Configura
tion_File_Examples

-Geoff

-----Original Message-----
From: Ben [mailto:tebulin_at_googlemail.com]
Sent: Wednesday, March 31, 2010 7:48 AM
To: users_at_subversion.apache.org
Subject: RE: Spurious svn:mergeinfo updated on random, untouched files on
minimalistic merge?!

Thank you very much for that helping link!
This is exactly the type of background information I've been looking for.

With the help of your linked article, if found out that on the root
directory
a mergeinfo was set. I tried to removed the existing property as workaround
on
both trunk & branch.

Unfortunately I still receive explicit entries mergeinfo entries following
this scheme on totally unrelated paths (no relevant commit since
branch-off):

Added: svn:mergeinfo
   Merged /branches/1.1.x/tools/releasenotes:r3101-3122*
Added: svn:mergeinfo
   Merged /branches/1.1.x/tools/releasenotes/axis-jaxrpc-1.3.jar:r3101-3122

Any hint on where those do origin from?
Are those issues adressed by svn 1.7.x?
The mentioned articel did not provide any explanation pattern for me.

Cheers!
- Ben

-----Original Message-----
From: Johan Corveleyn [mailto:jcorvel_at_gmail.com]
Sent: Tuesday, March 30, 2010 12:21 PM

I don't have time right now to analyze and explain your particular
situation, but as for a link to detailed background information, you
might want to read this article:
http://www.collab.net/community/subversion/articles/merge-info.html

Also, if I understood correctly, improvements are being made in this
area for svn 1.7 (for starters, in 1.7 only subtrees affected by the
merge will have their mergeinfo updated). But it's too early to tell
how that will work out. Svn 1.7 is still at least a couple of months
away...

-- 
Johan
Received on 2010-03-31 14:56:55 CEST

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