Easy as this!

svnmerge.py merge --source DMS/ip/diffim/trunk
 # uh.... ....
 # svnmerge: "." has local modifications; it must be clean

OK, so its not so easy. If I type svn diff/commit nothing happens, so I am up-to-date in that sense. What is the deal here?!

Lets have a look at the documentation for svnmerge  here. If I see what updates are available : svnmerge.py avail --diff --source DMS/ip/diffim/trunk I do see changes that need to be implemented, just not sure how to get them...

I was an idiot! And deleted some files. svn update fixed this, and then it worked...

becker194: svnmerge.py merge --source DMS/ip/diffim/trunk

 property 'svnmerge-integrated' set on '.'
 property 'svnmerge-blocked' deleted from '.'.
 U  python/lsst/ip/diffim/imageSubtract.py
 U  python/lsst/ip/diffim/pipeline/ImageSubtractStage.py
 U  python/lsst/ip/diffim/computePsfMatchingKernelForMaskedImage.py
 U  tests/ImageSubtract_1.py
 U  include/lsst/ip/diffim/ImageSubtract.h
 U  src/wcsMatch.cc
 U  src/ImageSubtract.cc
 U  examples/runImageSubtract.py
 U  examples/runManyImageSubtract.py
  U .
 property 'svnmerge-integrated' set on '.'
 property 'svnmerge-blocked' deleted from '.'.