merge doesn't merge changes
From: Chris Withers <chris_at_simplistix.co.uk>
Date: Thu, 18 Feb 2010 10:19:23 +0000
The repo in question is public, so please feel free to attempt the same
So, the story is that I was doing development on trunk, but I needed to
Sounds simple enough to do the last part, right?
- svn merge -r 4195:HEAD
Except this merges no changes :-(
svn diff -r 4195:HEAD
svn merge --ignore-ancestry -r 4195:HEAD
Anyone have any ideas how I can merge my changes other than bye hand?!
-- Simplistix - Content Management, Batch Processing & Python Consulting - http://www.simplistix.co.ukReceived on 2010-02-18 11:19:54 CET
This is an archived mail posted to the Subversion Users mailing list.