[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Cannot use svn_relpath_join() for path created in svn_client__path_relative_to_root()

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Fri, 6 Nov 2009 14:33:44 +0100

Hi!

When trying to replace svn_path_join() in libvn_client/merge.c I for
some reasson cannot use svn_relpath_join() with a path created in
svn_client_path__relative_to_root() as base.

* libsvn_client/merge.c
  (do_directory_merge): Creates mergeinfo_path with a call to
    svn_client__path_relative_to_root(). Calls
    record_mergeinfo_for_dir_merge().

* libsvn_client/merge.c
  (record_mergeinfo_for_dir_merge): Contains the following snippet
starting on line 6906. If I replace svn_path_join() with svn_uri_join()
everything works fine but if I use svn_relpath_join() then shabang!
Almost every merge_test fails.

[[[
          child_repos_path = svn_dirent_is_child(merge_b->target_abspath,
                                                 child->abspath, iterpool);
          if (!child_repos_path)
            child_repos_path = "";

          child_merge_src_canon_path = svn_path_join(mergeinfo_path,
                                                     child_repos_path,
                                                      iterpool);
]]]

/Daniel

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2415091
Received on 2009-11-06 14:34:18 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.