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

Re: Question about excessive mergeinfo

From: Geoff Rowell <geoff.rowell_at_gmail.com>
Date: Tue, 12 Jan 2010 10:30:53 -0500

On Mon, Jan 11, 2010 at 8:28 AM, Stein Somers <ssomers_at_opnet.com> wrote:
> No explanation here, and not the same symptoms, but you're not the only one
> struggling with it. I have a pre-commit hook to detect mergeinfo below root,
> and remove it whenever it occurs, which is rare. The repository has only
> mergeinfo on root directories, merges are done only on roots, no switched or
> shallow WC. No externals either. Still, svn 1.6.6 tries to push excessive
> mergeinfo your way. Luckily only plain and simple recursive mergeinfo.
>
> When copying by URL a subdirectory from another branch to somewhere in a WC,
> the new subdirectory always gets a mergeinfo property. Its value is a copy
> of the mergeinfo of the root of the source branch (where this "root" is an
> interpretation of course; more accurately, it is the nearest (and only)
> higher directory that has a mergeinfo property, relative to the copied
> subdirectory). Not surprisingly, the new mergeinfo is a subset of the
> mergeinfo of the current working copy root: fewer branches listed, fewer
> revisions listed. In my interpretation of the rules, this mergeinfo is
> entirely useless. So no thank you, I don't commit it.
>
Yes. My developers have seen this unwanted addition of mergeinfo from
URL copying, too.

The mergeinfo restriction in the hook has proven invaluable in
preventing a commit of it.

--
Geoff Rowell
geoff.rowell_at_gmail.com
Received on 2010-01-12 16:31:27 CET

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