* subversion/libsvn_client/repos_diff.c
  (diff_state_handle): Handle adds and modifications of files and directories
    with just one code path. Resolve variable shadowing problems.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1438936 13f79535-47bb-0310-9956-ffa450edef68