diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2015-10-12 08:54:49 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2015-10-12 08:54:49 +0000 |
| commit | dc5d469d6574e9fb03bdd793658bb371315b306a (patch) | |
| tree | 013c2e6845398e5a9ca4901dcc077769c7520e1d /subversion/libsvn_client/mergeinfo.h | |
| parent | 58218291fa73a17020ef0447398e9e8a78f9e8c7 (diff) | |
Diffstat (limited to 'subversion/libsvn_client/mergeinfo.h')
| -rw-r--r-- | subversion/libsvn_client/mergeinfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subversion/libsvn_client/mergeinfo.h b/subversion/libsvn_client/mergeinfo.h index 0c4cf05d56e6..1d6d524f5dd2 100644 --- a/subversion/libsvn_client/mergeinfo.h +++ b/subversion/libsvn_client/mergeinfo.h @@ -316,7 +316,9 @@ svn_client__get_history_as_mergeinfo(svn_mergeinfo_t *mergeinfo_p, /* Parse any explicit mergeinfo on LOCAL_ABSPATH and store it in *MERGEINFO. If no record of any mergeinfo exists, set *MERGEINFO to NULL. - Does not acount for inherited mergeinfo. */ + Does not acount for inherited mergeinfo. + + Allocate the result deeply in @a result_pool. */ svn_error_t * svn_client__parse_mergeinfo(svn_mergeinfo_t *mergeinfo, svn_wc_context_t *wc_ctx, @@ -358,8 +360,6 @@ svn_client__record_wc_mergeinfo_catalog(apr_hash_t *result_catalog, working copy or the nearest switched parent for an elision destination, if none is found check the repository, otherwise check as far as WC_ELISION_LIMIT_ABSPATH within the working copy. - TARGET_WCPATH and WC_ELISION_LIMIT_ABSPATH, if it exists, must both be - absolute or relative to the working directory. Elision occurs if: |