[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: Daniel Atallah <daniel.atallah_at_gmail.com>
Date: 2006-08-25 15:37:33 CEST

On 8/25/06, jackrew2000-antispam@yahoo.fr <jackrew2000-antispam@yahoo.fr> wrote:
> 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.

Subversion merging works because it knows the incremental changes. If
you've merely imported the final version of each "site" into different
branches, there is no ancestry and therefore no relationship for
Subversion to use for merging.

Assuming that you didn't have your sites under any sort of version
control previously:

You might have better success by importing the originial version into
the trunk (as you have done) and then immediately branching it into
the "site1" and "site2" versions. You can then overwrite the branched
files (already committed to svn) with your "site1" and "site2"
versions and commit. Your branches will now have a relationship with
the trunk and you will be able to merge.

This may still be a largely manual merging process depending on the
types of changes that you've made - the fact that it will be one large
change in each of the branches instead of several smaller incremental
changes will increase the likelyhood of large conflicts.

-D

---------------------------------------------------------------------
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:38:20 2006

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