Re: Help joining together 2 distinct branches!!

Hmmm... At a guess you'll need to know:

- The deletion revision of the old path you want to resurrect. eg 121
- the range of commits made in the new location. EG 123-125

Now you can

1. "svn rm" the new location
2. "svn cp" the old location from just prior to the deletion revision
to the new location (retaining history)
3. "svn merge" to reapply the range of commits from the previous 'new
location' to the current 'new location'...

I'm new to Subversion myself and will need to consult the red-mage in
the wizards tower for the appropriate incantation to use for the merge
but I' think the approach is about right.

NB: Actually, it's possible Subversion merges use voodoo and not
arcane magic... #61 in
http://www.codesqueeze.com/101-ways-to-know-your-software-project-is-doomed/

--
Talden
On 7/24/07, Joe Shomphe <jshomphe@gmail.com> 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
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org