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

Re: merge doesn't merge changes - bug, but in which version?

From: Chris Withers <chris_at_simplistix.co.uk>
Date: Mon, 22 Feb 2010 11:26:47 -0500

Chris Withers wrote:
> Chris Withers wrote:
>> - svn co
>> https://secure.simplistix.co.uk/svn/Simplistix/testfixtures/branches/1.8
>>
>> - svn merge -r 4195:HEAD
>> https://secure.simplistix.co.uk/svn/Simplistix/testfixtures/trunk .
>>
>> Except this merges no changes :-(
>
> Okay, so the server runs svn as supplied in debian stable, which is 1.5.1.
>
> I tried taking a dump of the repository and creating a copy locally from
> the dump with the local svn version on my laptop, which is 1.6.0.
>
> In this local copy, the merge works as expected.
>
> *sigh*
>
> So, what version of svn was this bug fixed in and where can I find out
> more about it?
>
> Also, what's the recommended way for me to get a newer version (where
> this bug is fixed) on my debian server?

Just to close this out, I ended up moving the server to 1.6 via debian's
backports and it solved the problem...

My love of svn continues to die :-(

Chris

-- 
Simplistix - Content Management, Batch Processing & Python Consulting
             - http://www.simplistix.co.uk
Received on 2010-02-22 17:27:19 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.