mergeinfo on all root files and folders

[James French <Ja...@naturalmotion.com>]

Hi,

We always do merges from the root of the repository. When these merges are done svn always marks up the mergeinfo on all first level files and folders as well as the root folder itself. Is this working as intended? We have had a practice for quite a while, dating back to buggy releases where we periodically delete all mergeinfo except for the root of the repository. I'm wondering whether I should amend the script to leave the first level files and folders intact as it seems that it is impossible to reintegrate a branch without these files and folders having the same mergeinfo as the root of the repository and in the past I have had to patch in the mergeinfo to get reintegrate to work.

Can anyone enlighten me on this?

Cheers,
James

Re: mergeinfo on all root files and folders

[Ulrich Eckhardt <ec...@satorlaser.com>]

On Tuesday 26 October 2010, James French wrote:
> We always do merges from the root of the repository.

Sounds weird, how do you do that? This means that either the source and target 
URL are the same, which makes this a no-op (unless perhaps when 
reverse-merging etc), or the source URL is a child of the target URL, which 
means the whole repository root contains itself as a child, i.e. an 
infinitely recursive tree.

> When these merges are done svn always marks up the mergeinfo on all first
> level files and folders as well as the root folder itself. Is this working
> as intended? We have had a practice for quite a while, dating back to buggy
> releases where we periodically delete all mergeinfo except for the root of
> the repository.

I have never merged to the repository root, but only to the roots of what we 
define here as projects, which use the normal trunk/tags/branches system.

That said, once a child has an explicit mergeinfo, it keeps it during further 
merges, which is the reason we only merge to the root of a project. Also note 
that the handling of mergeinfo changed in the not-so-recent past, so you 
might want to
 * check the versions of all(!) clients and the server
 * check the versions or date of svnadmin used to create the repository
 * check the release info for mergeinfo handling between those versions

At the very least share those versions with us, maybe that would explain 
everything already to some of the people here.

> I'm wondering whether I should amend the script to leave the first level
> files and folders intact as it seems that it is impossible to reintegrate a
> branch without these files and folders having the same mergeinfo as the
> root of the repository and in the past I have had to patch in the mergeinfo
> to get reintegrate to work.

You shouldn't have to touch the mergeinfo at all! What you do seems like 
workaround that isn't making things better, let alone fixing the actual 
problem.

Uli

-- 
ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
FAQ: http://subversion.apache.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.
**************************************************************************************