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

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

From: Chris Withers <chris_at_simplistix.co.uk>
Date: Wed, 18 Mar 2009 10:27:34 +0000

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?



Simplistix - Content Management, Zope & Python Consulting
            - http://www.simplistix.co.uk
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-18 14:08:45 CET

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.