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

Help joining together 2 distinct branches!!

From: Joe Shomphe <jshomphe_at_gmail.com>
Date: 2007-07-23 20:33:57 CEST

A co-worker recently made a small mistake moving some of our folders around
in our repository

we had the following structure:

/trunk/project
/tags/project (etc)

and our desired structure was to be:

/project/trunk
/project/tags (etc)

Rather than doing an svn mv /trunk/project to /project, this person simply
checked out /trunk/project
did a svn mkdir /project and then using tortoise or some similar tool added
all of the files and committed...THUS BREAKING ANY ANCESTRY

since then, changes have been made on /project/trunk

What I would like to do, is recreate /project/trunk correctly (with svn mv
and a new path...like /project_tmp/trunk) and somehow be able to "replay"
all changes that have been made to date on /project/trunk and merge them
(including propsets, checkin comments and userids) onto the temporary
structure. Once done, I can do one final rename and have a correct
structure again

Any clues on how I can do the "merging" of all changes (including
properties, checkin comments and userids) ?

thanks

jshomphe@ gee mail dot com
Received on Mon Jul 23 20:33:01 2007

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