* subversion/libsvn_wc/upgrade.c   (svn_wc__upgrade_conflict_skel_from_raw): We cannot use the    svn_wc__db_from_relpath() function here because it checks    the working copy format number against SVN_WC__VERSION.    During upgrades, this check will fail, causing a fatal error.    Instead, inline the equivalent of svn_wc__db_from_relpath(), which    is nothing more than an svn_dirent_join() to the wcroot path anyway.
* subversion/libsvn_wc/upgrade.c
  (svn_wc__upgrade_conflict_skel_from_raw): We cannot use the
   svn_wc__db_from_relpath() function here because it checks
   the working copy format number against SVN_WC__VERSION.
   During upgrades, this check will fail, causing a fatal error.
   Instead, inline the equivalent of svn_wc__db_from_relpath(), which
   is nothing more than an svn_dirent_join() to the wcroot path anyway.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion