You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Chris Withers <ch...@simplistix.co.uk> on 2009/03/18 10:27:34 UTC

Re: Why is this merge failing? [bug in 1.5.x?]

Chris Withers wrote:
> I'm using svn version 1.5.6 (r36142) on the client and 1.5.1 (r32289) on 
> the server.
> 
> I don't understand why doing this merge:
> 
> svn merge -r 3800:HEAD https://secure.simplistix.co.uk/svn/xlutils/trunk
> 
> Into a checkout at this state:
> 
> Path: .
> URL: https://secure.simplistix.co.uk/svn/xlutils/branches/xlutils.copy
> Repository Root: https://secure.simplistix.co.uk/svn
> Repository UUID: ac150577-6901-3246-a117-cd8547e6756f
> Revision: 3803
> 
> ...is resulting in nothing being merged.

...and of course it works just fine with a version 1.4.5 (r25188) client.

Can someone tell me what I'm doing wrong or is this just another example 
of 1.5's brown-bag-iness?

cheers,

Chris

-- 
Simplistix - Content Management, Zope & Python Consulting
            - http://www.simplistix.co.uk

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

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