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

Re: Svn 1.7 merge info property

From: Ulrich Eckhardt <ulrich.eckhardt_at_dominolaser.com>
Date: Wed, 29 Aug 2012 09:57:10 +0200

Am 29.08.2012 00:32, schrieb Rp0013:
> I wanted to mute the svn merge info property on my subversion server
>
> Is there such a way

You could set up a pre-commit hook that makes sure that this property
isn't touched in commits.

> We don't need the info currently and when merging it is causing a
> huge log with all changes to property being recorded and what we need
> is only the code merge

Actually, there should be just a single directory (the root directory of
the project) which receives this property. This assumes that you always
merged from and to that directory, otherwise elements underneath that
directory can also receive their own and distinct mergeinfo property,
which they will also retain over future merges.

I'd suggest this:
1. Educate your users that for proper merge tracking, they should always
use the root directory as source and target even if the changes are only
in a subdirectory thereof.
2. Delete the mergeinfo property from all non-root files and directories.
3. Optionally set up a pre-commit hook that verifies that only root
directories receive the merge info.

The result is that you have proper merge tracking (sorry, you say you
don't want that, but it's hard for me to imagine that) but the only
place where it is recorded is the root of your project. I'd hope that
that could make everyone happy.

Greetings from Hamburg!

Uli

**************************************************************************************
Domino 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.dominolaser.com
**************************************************************************************
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. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
Received on 2012-08-29 09:57:46 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.