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

SVN 1.6.2 Mergre is not handling merges gracefully

From: Raju N <raju.svsv_at_gmail.com>
Date: Tue, 15 Sep 2009 23:38:39 +0530

We are trying to merge a branch to trunk and we are facing the error "svn:
Attempt to add tree conflict that already exists" when we tried it through
the SVN command line. But when the same action was performed through
tortoise svn the merge is working fine. Please see the below output for the
merge that is being attempted by svn command line client.

SVN Command line client:

[raju_at_raju commontech]$ svn merge -r 279366:HEAD
svn://X.X.X.X/ivyrepository/partygaming/trunk/commontech/ .
--accept=postpone --username rajun --password xxxxxx --no-auth-cache
--- Merging r279367 through r295637 into 'trunk':
 U trunk/devlib
--- Merging r279367 through r295637 into 'trunk/lib':
   C trunk/lib/aal2wrap.jar
   C trunk/lib/libaal2sdk.so
   C trunk/lib/axiom-api-1.2.7.jar
C trunk/lib/servlet-api.jar
C trunk/lib/ognl-2.7.2-pg-fix.jar
Skipped 'trunk/lib/axis2-kernel-1.4.1.jar'
   C trunk/lib/commons-httpclient-3.0.1.jar
   C trunk/lib/inotify-java-0.1.jar
 U trunk/lib
--- Merging r279367 through r295637 into 'trunk/server':
   C trunk/server/src/test/com/pg/server/security
--- Merging r279367 through r295637 into
 U trunk/server/src/test/com/pg/terracotta
--- Merging r279367 through r295637 into 'trunk/server':
C trunk/server/src/main/com/pg/log4j/ComponentWiseLoggers.java
   C trunk/server/src/main/com/pg/utils/CaptchaUtils.java
--- Merging r279367 through r295637 into
 U trunk/server/src/main/com/pg/ezecash
--- Merging r279367 through r295637 into 'trunk/server':
C trunk/server/src/main/com/pg/site/sso/SSOHelper.java
C trunk/server/src/main/com/pg/site/sso/db/SSODBManager.java
*svn: Attempt to add tree conflict that already exists
*[raju_at_raju commontech]$

Tortoise SVN:

It is asking for the options on how to resolve the merge conflict and
handling the merge very smoothly. Please see the attached screenshots.

How is it that the tortoise svn is handling the merge properly but the
command line client couldn't. Is this propably a bug with the svn command
line client?

SVN Server Version:1.6.2
SVN Client Version: 1.6.2
Tortoise Client Version: 1.6.2

Raju N.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

succesfull_merge.JPG Merge_option_prompt.JPG
Received on 2009-09-15 20:14:48 CEST

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

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