[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: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: Mon, 11 Jan 2010 17:17:19 +0100

On Monday 11 January 2010, Stein Somers 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.

Doh. Wish I had had that idea earlier.

> 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).

Technically, a missing mergeinfo implicitly means that a dir or file has its
parent dir's mergeinfo. This is even documented. So, the source dir doesn't
actually get a new and different mergeinfo, it is only set on the dir
explicitly now while it was implicit before.

> 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.

I think SVN wants you to not copy the file/dir but instead to merge the
revision where it was added to the branch. Yes, a simple copy is easier to
explain in some cases, though it doesn't capture all possible changes in a



ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
           Visit our website at <http://www.satorlaser.de/>
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
Received on 2010-01-11 17:18:01 CET

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.