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

URGENT : Merge help requested.

From: Santhosh Raghunath <sraghunath_at_adteractive.com>
Date: 2006-09-01 00:24:25 CEST

We are facing an issue with 'svn merge' at our project.

 

VERISIGN_MIDAS_2 is a copy of VERISIGN_MIDAS below. Both are branches.
When doing a svn merge from VERISIGN_MIDAS to VERISIGN_MIDAS_2 we are
noticing that all 'new' changes (added files and folders) under
VERISIGN_MIDAS_2 are getting 'wiped out'. The merge is exactly
synchronizing the 'source' with the 'target' directory and not
'concatenating' changes from source into the target.

 

To confirm this I ran a small test below.

 

Example 1:

Added folder 'BLACK' into VERISIGN_MIDAS - merge from MIDAS_2 to MIDAS

 

[build@build temp]$ svn merge
http://svn:81/svn/midas/branches/VERISIGN_MIDAS
http://svn:81/svn/midas/branches/VERISIGN_MIDAS_2/ VERISIGN_MIDAS

D VERISIGN_MIDAS/BLACK

U VERISIGN_MIDAS/src/com/adteractive/db/DatabaseConstants.java

U VERISIGN_MIDAS/src/com/adteractive/db/enginedb2.sql.properties

A VERISIGN_MIDAS/src/com/adteractive/backoffice/webui/group

A
VERISIGN_MIDAS/src/com/adteractive/backoffice/webui/group/GroupAction.ja
va

A
VERISIGN_MIDAS/src/com/adteractive/backoffice/webui/group/GroupActionFor
m.java

A VERISIGN_MIDAS/src/com/adteractive/catalogs/GroupVO.java

A VERISIGN_MIDAS/src/com/adteractive/catalogs/GroupDAO.java

A VERISIGN_MIDAS/web_backoffice/WEB-INF/lib

U VERISIGN_MIDAS/web_backoffice/WEB-INF/struts-config.xml

A VERISIGN_MIDAS/web_backoffice/admin/group.jsp

U VERISIGN_MIDAS/web_backoffice/mainmenu.jsp

[build@build temp]$

 

 

Example 2:

Merge from MIDAS to MIDAS_2

 

[build@build temp]$ svn merge
http://svn:81/svn/midas/branches/VERISIGN_MIDAS_2
http://svn:81/svn/midas/branches/VERISIGN_MIDAS/ VERISIGN_MIDAS_2

U VERISIGN_MIDAS_2/src/com/adteractive/db/DatabaseConstants.java

U VERISIGN_MIDAS_2/src/com/adteractive/db/enginedb2.sql.properties

D
VERISIGN_MIDAS_2/src/com/adteractive/backoffice/webui/group/GroupAction.
java

D
VERISIGN_MIDAS_2/src/com/adteractive/backoffice/webui/group/GroupActionF
orm.java

D VERISIGN_MIDAS_2/src/com/adteractive/backoffice/webui/group

D VERISIGN_MIDAS_2/src/com/adteractive/catalogs/GroupVO.java

D VERISIGN_MIDAS_2/src/com/adteractive/catalogs/GroupDAO.java

D VERISIGN_MIDAS_2/web_backoffice/WEB-INF/lib

U VERISIGN_MIDAS_2/web_backoffice/WEB-INF/struts-config.xml

D VERISIGN_MIDAS_2/web_backoffice/admin/group.jsp

U VERISIGN_MIDAS_2/web_backoffice/mainmenu.jsp

A VERISIGN_MIDAS_2/BLACK

[build@build temp]$

 

 

What we can observe here is the Target folder is being 'Syncronized'
with the Source folder. This is not what we want.

 

Is there any other way we can do a proper merge as we want i.e. keep the
new updates in the target folder while merging from a different branch?
Will 'svnmerge' tool help us?

 

OR are we doing something wrong here?

 

~Santhosh

 

Santhosh Raghunath

Cell : 408-833-8877

 

 
Received on Fri Sep 1 00:25:41 2006

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