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/svnsync/svnsync.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/svnsync/svnsync.c')
| -rw-r--r-- | subversion/svnsync/svnsync.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/subversion/svnsync/svnsync.c b/subversion/svnsync/svnsync.c index 0bdc976..621b782 100644 --- a/subversion/svnsync/svnsync.c +++ b/subversion/svnsync/svnsync.c @@ -38,6 +38,7 @@ #include "private/svn_opt_private.h" #include "private/svn_ra_private.h" #include "private/svn_cmdline_private.h" +#include "private/svn_subr_private.h" #include "sync.h" @@ -312,7 +313,7 @@ check_lib_versions(void) }; SVN_VERSION_DEFINE(my_version); - return svn_ver_check_list(&my_version, checklist); + return svn_ver_check_list2(&my_version, checklist, svn_ver_equal); } @@ -1297,7 +1298,7 @@ replay_rev_finished(svn_revnum_t revision, if (rb->sb->committed_rev != revision) return svn_error_createf (APR_EINVAL, NULL, - _("Commit created rev %ld but should have created %ld"), + _("Commit created r%ld but should have created r%ld"), rb->sb->committed_rev, revision); SVN_ERR(svn_ra_rev_proplist(rb->to_session, revision, &existing_props, |
