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 suppli

Re: merge doesn't merge changes

On Thu, Feb 18, 2010 at 5:19 AM, Chris Withers wrote: > 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 whi

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, w

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