Partial-tree merge

Hi everyone,

I have a question: I need to merge only some subtrees of a project which looks like
(names changed to protect the guilty):

  part/sub/view
  part/sub/watch
  part/sub/see
  part/sub/peer

I want only to merge 'watch' and 'view'. For 'view' I can just go into that
directory of a sandbox of the target branch and do 'svn merge'.

Unfortunately 'watch' does not exist in the target tree yet, so I can't
go in there to merge, and when I instead merge the entire 'path/sub'
and do only commit 'watch' I very much suspect that the mergeinfo will
be wrong, being set only on 'path/sub', but not on 'path/sub/watch'. (At
least, there is only a mergeinfo property on the merge base directory;
I doubt that a subtree commit will redistribute that.)

How can I gen svn to do what I want? [1]

Besides, when I'm getting tree conflicts of the add/add kind, and it's
(on 1.6.9) annoyingly complicated to get a diff between the working
copy file and the version on the branch just merged in (like 'svn cat
^/the/long/repo/pathname/of/module/branches/cvs/local/path/filename |
diff -u - filename'). Is there some trick?

Andreas

[1] I might add that the very ability to do partial merges is the main
    reason I do not actively promote using git.

-- 
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800