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

Re: Renaming trunk and then reintegrating from branch to new trunk name

From: Thorsten Schöning <tschoening_at_am-soft.de>
Date: Tue, 7 May 2013 11:15:21 +0200

Guten Tag Z W,
am Dienstag, 7. Mai 2013 um 09:15 schrieben Sie:

> Suppose trunk has been merging to branch. would renaming a trunk
> (trunk name change) causes an automatic change in the svn:mergeinfo
> of a branch[...]

No, Subversion doesn't magically generates "changes" in your working
copy to unrelated folders, files or properties which you didn't change
in any way.

> Then when branch needs to reintegrate to the new renamed trunk, would it
> work because mergeinfo is pointing to old trunk name from branch
> perspective ?

I may be wrong but from my understanding reintegration looks from the
target perspective, meaning if you want to reintegrate a branch into a
trunk, trunk is checked for all versions from the branch which may
already have been applied. That's way TortoiseSVN e.g. gives an error
if not all changes from trunk have been merged into the branch after
it's branching. After renaming the trunk you could merge the rename as
record only to your branch and should be able to reintegrate
afterwards. How that works of course depends on the changes between
your new trunk and the branch to reintegrate.

Mit freundlichen Grüßen,

Thorsten Schöning

Thorsten Schöning       E-Mail:Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/
Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Received on 2013-05-07 11:15:49 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.