You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/04/20 17:15:51 UTC
svn commit: r1588779 - in /subversion/branches/1.8.x-issue4480: ./
subversion/mod_dav_svn/repos.c
Author: rhuijben
Date: Sun Apr 20 15:15:50 2014
New Revision: 1588779
URL: http://svn.apache.org/r1588779
Log:
Merge r1588778 from trunk, resolving conflicts.
Modified:
subversion/branches/1.8.x-issue4480/ (props changed)
subversion/branches/1.8.x-issue4480/subversion/mod_dav_svn/repos.c
Propchange: subversion/branches/1.8.x-issue4480/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1588778
Modified: subversion/branches/1.8.x-issue4480/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-issue4480/subversion/mod_dav_svn/repos.c?rev=1588779&r1=1588778&r2=1588779&view=diff
==============================================================================
--- subversion/branches/1.8.x-issue4480/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.8.x-issue4480/subversion/mod_dav_svn/repos.c Sun Apr 20 15:15:50 2014
@@ -1828,31 +1828,22 @@ do_out_of_date_check(dav_resource_combin
For now I would say reporting out of date in a few too many
cases is safer than not reporting out of date when we should.
*/
- svn_revnum_t youngest;
- svn_fs_root_t *youngest_root;
+ svn_revnum_t txn_base_rev;
+ svn_fs_root_t *txn_base_root;
svn_fs_root_t *rev_root;
- svn_fs_id_t *youngest_id;
+ svn_fs_id_t *txn_base_id;
svn_fs_id_t *rev_id;
- serr = svn_fs_youngest_rev(&youngest, comb->res.info->repos->fs,
- r->pool);
- if (serr != NULL)
- {
- return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "Could not determine the youngest "
- "revision for verification against "
- "the baseline being checked out",
- r->pool);
- }
+ txn_base_rev = svn_fs_txn_base_revision(comb->res.info->root.txn);
- if (comb->priv.version_name == youngest)
- return NULL; /* Easy out: we commit against HEAD */
+ if (comb->priv.version_name == txn_base_rev)
+ return NULL; /* Easy out: Nothing changed */
- serr = svn_fs_revision_root(&youngest_root, comb->res.info->repos->fs,
- youngest, r->pool);
+ serr = svn_fs_revision_root(&txn_base_root, comb->res.info->repos->fs,
+ txn_base_rev, r->pool);
if (!serr)
- serr = svn_fs_node_id(&youngest_id, youngest_root,
+ serr = svn_fs_node_id(&txn_base_id, txn_base_root,
comb->priv.repos_path, r->pool);
if (serr != NULL)
@@ -1879,9 +1870,9 @@ do_out_of_date_check(dav_resource_combin
}
svn_fs_close_root(rev_root);
- svn_fs_close_root(youngest_root);
+ svn_fs_close_root(txn_base_root);
- if (0 == svn_fs_compare_ids(youngest_id, rev_id))
+ if (0 == svn_fs_compare_ids(txn_base_id, rev_id))
{
serr = svn_error_createf(SVN_ERR_RA_OUT_OF_DATE, NULL,
"Directory '%s' is out of date",