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

Renaming the source path of a branch and merging

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 23 Apr 2010 12:07:42 -0400

Hi All,

I know I could try this in a test repo... but things always seem to work with 1 file and 1 line change much better.

The scenerio is this. We have decided to change our repo structure under a project a bit. Rather than current dev being in trunk we want to name the folder for the next Major.Minor release. So, we will have a branch for planned release strategy rather than next release ver always being in branch and branch for release. For several reasons.

Anyway... We currently have ProjectName/trunk which is version 6.5.1. Our next release will be a major one so a copy of trunk was made to ProjectName/v7.0.0. Now, to align the repo with the new strategy we want to rename trunk to v6.5.1.

Question, if I do this, will I have a problem merging from v6.5.1 to v7.0.0 as fixes are applied to v6.5.1 path?

Will there be a problem if I merge while it is still named /trunk and then rename it... seeing as the mergeinfo is going to specify /trunk:XXXX-YYYY or is svn smart enough to follow the history back and know that if I do my next merge from /v7.0.0 that since trunk was it's ancestor that it won't try to merge in the same revisions from the /v7.0.0 path that it already merged in from the /trunk path?

Thanks,
BOb
Received on 2010-04-23 18:06:42 CEST

This is an archived mail posted to the Subversion Users mailing list.