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

Lost control of the development

From: <jackrew2000-antispam_at_yahoo.fr>
Date: 2006-08-25 14:54:17 CEST

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

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Aug 25 14:54:26 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.