svn show changed files at revision
git assume unchanged
fixing diffs
merge parent