2013/7/6 Greg Stein <gst...@gmail.com>: > On Fri, Jul 5, 2013 at 1:21 PM, <danie...@apache.org> wrote: >>... >> +++ subversion/trunk/subversion/libsvn_client/switch.c Fri Jul 5 17:21:09 >> 2013 >> @@ -239,7 +239,7 @@ switch_internal(svn_revnum_t *result_rev >> return svn_error_createf(SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL, >> _("'%s' shares no common ancestry with >> '%s'"), >> switch_url, >> - svn_dirent_dirname(local_abspath, pool)); >> + svn_dirent_local_style(local_abspath, >> pool)); > > Did you intend to keep the filename in the message, too? The above > isn't just a style change, but it (now) retains the filename in the > path. >
I am not part of original discussion, but I would say that retaining the filename here is the right thing. It is visible if you are switching specific file, not its parent directory. E.g. [[[ svn --version svn co https://svn.apache.org/repos/asf/subversion/trunk/subversion/svnversion/ wc svn switch https://svn.apache.org/repos/asf/subversion/trunk/subversion/svnversion/svnversion.1 wc/svnversion.c ]]] I am using svn, version 1.8.0 (r1490375) compiled Jun 17 2013, 19:47:41 on x86-microsoft-windows The last command produces [[[ D:\workspace\test>svn switch https://svn.apache.org/repos/asf/subversion/trunk/subversion/svnversion/svnversion.1 wc/svnversion.c svn: E195012: Path 'wc\svnversion.c' does not share common version control ancestry with the requested switch location. Use --ignore-ancestry to disable this check. svn: E195012: 'https://svn.apache.org/repos/asf/subversion/trunk/subversion/svnversion/svnversion.1' shares no common ancestry with 'D:/workspace/test/wc' ]]] That 'D:/workspace/test/wc' makes no sense. I would expect 'D:/workspace/test/wc/svnversion.c' Best regards, Konstantin Kolinko