diff options
| author | peter <peter@FreeBSD.org> | 2013-11-11 01:00:29 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-11-11 01:00:29 +0000 |
| commit | 68301b10e52aedbf076b5b08303439d75c192e18 (patch) | |
| tree | c05673887167c7ecd55a62ed72830f5186f453c1 /subversion/libsvn_wc/info.c | |
| parent | 3b9f7e96381479fb03ae2c36d490a38718f71083 (diff) | |
| download | FreeBSD-src-68301b10e52aedbf076b5b08303439d75c192e18.zip FreeBSD-src-68301b10e52aedbf076b5b08303439d75c192e18.tar.gz | |
Import svn-1.8.4, which includes fixes for both security and merge
handling.
Diffstat (limited to 'subversion/libsvn_wc/info.c')
| -rw-r--r-- | subversion/libsvn_wc/info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/libsvn_wc/info.c b/subversion/libsvn_wc/info.c index 4a37e00..dc80ee7 100644 --- a/subversion/libsvn_wc/info.c +++ b/subversion/libsvn_wc/info.c @@ -548,7 +548,7 @@ svn_wc__get_info(svn_wc_context_t *wc_ctx, &repos_uuid, wc_ctx->db, svn_dirent_dirname( - local_abspath, + this_abspath, iterpool), scratch_pool, iterpool)); |
