merge doesn't merge changes

Hi All, The repo in question is public, so please feel free to attempt the same thing here and tell me what I'm doing wrong. So, the story is that I was doing development on trunk, but I needed to branch off to do some changes while not releasing the stuff I currently had to trunk. So, trunk

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

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

Re: How to recover from a "checksum mismatch"

Gregory Berkolaiko wrote: Due to some (yet unknown) mistake, my colleague is experiencing a "checksum mismatch" error message. Is there a civilized way to recover from such a mismatch. The solutions I found posted on the web are all klutches: the mildest being "check out a fresh copy, substitut

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

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