Re: SVN 1.6.2 Mergre is not handling merges gracefully

Hi

can i know the bug id please

Regards,
Raju N

On Tue, Sep 15, 2009 at 11:55 PM, Stefan Sperling <stsp_at_elego.de> wrote:

> 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.
>
> Stefan
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395440

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 12:19:44 CEST