Help...lost svn ancestry

[Joe Shomphe <js...@gmail.com>]

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

Re: Help...lost svn ancestry

[Vasili Sviridov <vs...@exceede.com>]

Joe Shomphe wrote:
> 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
Well, since it's source control - nothing's lost :)

what you can do is to make to separate dumps - before the split and 
after using (svnadmin dump -r 0:<splitRevision> && svnadmin dump -r 
<splitRevision+1>). manually change the paths in the second dump file to 
point to the proper directory (using sed for instance). and then restore 
them into a new repository. (don't restore into the current, or make a 
full backup first).

V.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org