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

Re: SVN 1.6.2 Mergre is not handling merges gracefully

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 15 Sep 2009 19:25:39 +0100

On Tue, Sep 15, 2009 at 11:38:39PM +0530, Raju N wrote:
> --- 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]$

This is known bug which will be fixed in 1.6.6, you can get a patch
for a 1.6.5 client like this:

svn diff http://svn.collab.net/repos/svn/branches/1.6.x@39163 \
  http://svn.collab.net/repos/svn/branches/1.6.x-r38000 > svn.patch

The problem is in the client, you don't need to patch the server.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-15 20:26:27 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.