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

Re: Lost control of the development

From: Simon Large <slarge_at_slarge.plus.com>
Date: 2006-08-25 15:57:56 CEST
('binary' encoding is not supported, stored as-is) On Fri Aug 25 13:54 , <jackrew2000-antispam@yahoo.fr> sent:

>Hello,
>
>I have lost control of my development. Several versions of the initial project
were developed on different sites for different needs. At that time no Subversion
>
>I am trying to make a 'reverse engineering' with Subversion to merge all the
versions into one including all the features.
>
>I have committed the 'original version' in the trunk
>
>If I update 'Site 1 version', it does not work because it is not versioned
>
>I have committed 'Site 1 version' and 'Site 2 version' in 2 branches.
>
>If I merge 'Site 1 version' and 'Site 2 version', the result is 100% 'Site 1
version', and 'Site 2 version' is discarded, no conflict.
>
>Is this reverse engineering possible, and how to implement it?
>
>Thank you for your help

This is going to be messy.

1. Commit the original version to trunk
2. Create new branch folders 'Site1', 'Site2', etc.
3. For each of those branches, SVN-copy the original version from trunk so that
every branch now has an identical copy.
4. Checkout the 'Site1' branch and dump the current version from that site,
overwriting the original version. You will end up with lots of modified files,
maybe some new ones, maybe some deletions.
5. Commit all these changes on the 'Site1' branch.
6. Repeat steps 4 & 5 for each of the other site branches.
7. Now go back to your trunk working copy and use SVN-merge to merge the (single
revision) changeset from 'Site1' branch into trunk.
8. Commit the modified trunk WC.
9. Repeat steps 7 & 8 for each of the other branches in turn. You may well get
conflicts at stage 7 if different sites have modified the same bits of code in
different ways. Resolve the conflicts before you commit :-)

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Aug 25 15:44:28 2006

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