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

merge doesn't merge changes

From: Chris Withers <chris_at_simplistix.co.uk>
Date: Thu, 18 Feb 2010 10:19:23 +0000

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 becamethe 1.8 branch and the 1.6 branch became
trunk. I did the dev work on trunk and released 1.7, now I want to merge
the changes made on trunk since was created from the 1.6 branch into the
1.8 branch, so the 1.8 branch can again become trunk.

Sounds simple enough to do the last part, right?

So:

- 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 :-(

svn diff -r 4195:HEAD
https://secure.simplistix.co.uk/svn/Simplistix/testfixtures/trunk
...shows the changes I would expected to see merged.

svn merge --ignore-ancestry -r 4195:HEAD
https://secure.simplistix.co.uk/svn/Simplistix/testfixtures/trunk
...also does nothing, so I really am at a loss here.

Anyone have any ideas how I can merge my changes other than bye hand?!

Chris

-- 
Simplistix - Content Management, Batch Processing & Python Consulting
            - http://www.simplistix.co.uk
Received on 2010-02-18 11:19:54 CET

This is an archived mail posted to the Subversion Users mailing list.