From 68301b10e52aedbf076b5b08303439d75c192e18 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 11 Nov 2013 01:00:29 +0000 Subject: Import svn-1.8.4, which includes fixes for both security and merge handling. --- subversion/libsvn_wc/old-and-busted.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'subversion/libsvn_wc/old-and-busted.c') diff --git a/subversion/libsvn_wc/old-and-busted.c b/subversion/libsvn_wc/old-and-busted.c index 20f7c6c..b87be85 100644 --- a/subversion/libsvn_wc/old-and-busted.c +++ b/subversion/libsvn_wc/old-and-busted.c @@ -811,11 +811,15 @@ atts_to_entry(svn_wc_entry_t **new_entry, ### not used by loggy; no need to set MODIFY_FLAGS */ entry->url = extract_string(atts, ENTRIES_ATTR_URL, pool); + if (entry->url) + entry->url = svn_uri_canonicalize(entry->url, pool); /* Set up repository root. Make sure it is a prefix of url. ### not used by loggy; no need to set MODIFY_FLAGS */ entry->repos = extract_string(atts, ENTRIES_ATTR_REPOS, pool); + if (entry->repos) + entry->repos = svn_uri_canonicalize(entry->repos, pool); if (entry->url && entry->repos && !svn_uri__is_ancestor(entry->repos, entry->url)) -- cgit v1.1