| commit | ca2369cba6d8f9e13f7ac41c9d2082d4f92619fc | [log] [tgz] |
|---|---|---|
| author | Paul Burba <pburba@apache.org> | Thu Jul 14 20:14:00 2011 +0000 |
| committer | Paul Burba <pburba@apache.org> | Thu Jul 14 20:14:00 2011 +0000 |
| tree | 6cec41a479cf5e064f6410828a99d5c11567c0fc | |
| parent | fcf6b24b5995103ae9186a6039abab09c235d71d [diff] |
On the 1.6.x-issue3957 branch: Merge r1146870 from ^/subversion/trunk. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3957@1146879 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/libsvn_client/merge.c b/subversion/libsvn_client/merge.c index 1e92bb9..2a1bfa5 100644 --- a/subversion/libsvn_client/merge.c +++ b/subversion/libsvn_client/merge.c
@@ -8249,7 +8249,8 @@ source_rev, svn_mergeinfo_inherited, FALSE, iterpool)); if (subtree_catalog) - source_mergeinfo = apr_hash_get(subtree_catalog, source_path, + source_mergeinfo = apr_hash_get(subtree_catalog, + source_path_rel_to_session, APR_HASH_KEY_STRING); /* A path might not have any inherited mergeinfo either. */