Am 02.08.2012 11:12, schrieb Martin Bischoff:
When I reintegrate a feature-branch into trunk, this creates a
svn:mergeinfo property on trunk, e.g. "Merged
/branches/featureBranch:r149-188".
What is the purpose of that information?
Subversion uses it for "merge tracking". This allows SVN to tell which
revisions from the feature branch are eligible for merging. E.g.
TortoiseSVN greys out those revisions to tell the user that they were
already merged. Subversion itself will simply ignore any requests to
merge those a second time, it would probably lead to conflicts anyway.
Can (or should) it be ignored when
committing trunk after the reintegrate-merge?
No!
Since it is recommended to delete feature-branches after they were
reintegrated, why should this mergeinfo be kept? Wouldn't that property
then be propagated to each and every future (feature-)branch and tag?
Yes, the info would be propagated. The thing about deleting feature
branches is true, but that doesn't hold for release branches which can
also be source or target of merges.
That said, if you think that a branch is dead and can be forgotten, you
can also delete that mergeinfo without causing any errors. A
reintegrate-merge could be such a case. However, it also doesn't hurt to
keep it, so I wouldn't bother.
Schoenen Tag!
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.
**************************************************************************************
