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 2010/03/08 22:34:38 UTC
svn commit: r920526 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: rhuijben
Date: Mon Mar 8 21:34:38 2010
New Revision: 920526
URL: http://svn.apache.org/viewvc?rev=920526&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(install_added_props): Remove call to svn_wc__db_base_set_dav_cache()
as the only caller, svn_wc_add_repos_file4() should never change
BASE_NODE information. (The information that was stored before this
patch is from the copy from origin, which is unrelated to the
BASE_NODE)
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=920526&r1=920525&r2=920526&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Mar 8 21:34:38 2010
@@ -6023,9 +6023,7 @@
SVN_ERR(accumulate_last_change(last_change, NULL, db, local_abspath,
entry_props, pool, pool));
- return svn_error_return(svn_wc__db_base_set_dav_cache(db, local_abspath,
- prop_hash_from_array(wc_props, pool),
- pool));
+ return SVN_NO_ERROR;
}
/* Append, to LOG_ACCUM, log commands to update the entry for LOCAL_ABSPATH
RE: svn commit: r920526 -
/subversion/trunk/subversion/libsvn_wc/update_editor.c
Posted by Julian Foad <ju...@wandisco.com>.
Bert Huijben wrote:
> Julian Foad wrote:
> > On Mon, 2010-03-08 at 21:34 +0000, rhuijben@apache.org wrote:
> > > (install_added_props): Remove call to
> > svn_wc__db_base_set_dav_cache()
> > > as the only caller, svn_wc_add_repos_file4() should never change
> > > BASE_NODE information. (The information that was stored before this
> > > patch is from the copy from origin, which is unrelated to the
> > > BASE_NODE)
> >
> > Please could you update the function's doc string. It says "BASE_PROPS
> > can contain entryprops and wcprops as well", implying that it does
> > something with both kinds, and now it doesn't.
>
> BASE_PROPS refers to the 'unmodified properties', to be stored in WORKING_NODE (See: @BASE), not to the properties of the BASE_NODE/checked out state (@ORIGINAL).
> This comment was written before the definition changed with WC-NG.
That function is in a half-way state of massive transition and its doc
string was completely out of kilter. I've verbosely augmented it in
r920868.
- Julian
RE: svn commit: r920526 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Julian Foad [mailto:julianfoad@btopenworld.com]
> Sent: dinsdag 9 maart 2010 11:15
> To: rhuijben@apache.org; dev@subversion.apache.org;
> commits@subversion.apache.org
> Subject: Re: svn commit: r920526 -
> /subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> On Mon, 2010-03-08 at 21:34 +0000, rhuijben@apache.org wrote:
> > Author: rhuijben
> > Date: Mon Mar 8 21:34:38 2010
> > New Revision: 920526
> >
> > URL: http://svn.apache.org/viewvc?rev=920526&view=rev
> > Log:
> > * subversion/libsvn_wc/update_editor.c
> > (install_added_props): Remove call to
> svn_wc__db_base_set_dav_cache()
> > as the only caller, svn_wc_add_repos_file4() should never change
> > BASE_NODE information. (The information that was stored before this
> > patch is from the copy from origin, which is unrelated to the
> > BASE_NODE)
>
> Please could you update the function's doc string. It says "BASE_PROPS
> can contain entryprops and wcprops as well", implying that it does
> something with both kinds, and now it doesn't.
BASE_PROPS refers to the 'unmodified properties', to be stored in WORKING_NODE (See: @BASE), not to the properties of the BASE_NODE/checked out state (@ORIGINAL).
This comment was written before the definition changed with WC-NG.
Bert
Re: svn commit: r920526 -
/subversion/trunk/subversion/libsvn_wc/update_editor.c
Posted by Julian Foad <ju...@btopenworld.com>.
On Mon, 2010-03-08 at 21:34 +0000, rhuijben@apache.org wrote:
> Author: rhuijben
> Date: Mon Mar 8 21:34:38 2010
> New Revision: 920526
>
> URL: http://svn.apache.org/viewvc?rev=920526&view=rev
> Log:
> * subversion/libsvn_wc/update_editor.c
> (install_added_props): Remove call to svn_wc__db_base_set_dav_cache()
> as the only caller, svn_wc_add_repos_file4() should never change
> BASE_NODE information. (The information that was stored before this
> patch is from the copy from origin, which is unrelated to the
> BASE_NODE)
Please could you update the function's doc string. It says "BASE_PROPS
can contain entryprops and wcprops as well", implying that it does
something with both kinds, and now it doesn't.
- Julian
> Modified:
> subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=920526&r1=920525&r2=920526&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Mar 8 21:34:38 2010
> @@ -6023,9 +6023,7 @@
> SVN_ERR(accumulate_last_change(last_change, NULL, db, local_abspath,
> entry_props, pool, pool));
>
> - return svn_error_return(svn_wc__db_base_set_dav_cache(db, local_abspath,
> - prop_hash_from_array(wc_props, pool),
> - pool));
> + return SVN_NO_ERROR;
> }
>
> /* Append, to LOG_ACCUM, log commands to update the entry for LOCAL_ABSPATH
>
>
Re: svn commit: r920526 -
/subversion/trunk/subversion/libsvn_wc/update_editor.c
Posted by Julian Foad <ju...@btopenworld.com>.
On Mon, 2010-03-08 at 21:34 +0000, rhuijben@apache.org wrote:
> Author: rhuijben
> Date: Mon Mar 8 21:34:38 2010
> New Revision: 920526
>
> URL: http://svn.apache.org/viewvc?rev=920526&view=rev
> Log:
> * subversion/libsvn_wc/update_editor.c
> (install_added_props): Remove call to svn_wc__db_base_set_dav_cache()
> as the only caller, svn_wc_add_repos_file4() should never change
> BASE_NODE information. (The information that was stored before this
> patch is from the copy from origin, which is unrelated to the
> BASE_NODE)
Please could you update the function's doc string. It says "BASE_PROPS
can contain entryprops and wcprops as well", implying that it does
something with both kinds, and now it doesn't.
- Julian
> Modified:
> subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=920526&r1=920525&r2=920526&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Mar 8 21:34:38 2010
> @@ -6023,9 +6023,7 @@
> SVN_ERR(accumulate_last_change(last_change, NULL, db, local_abspath,
> entry_props, pool, pool));
>
> - return svn_error_return(svn_wc__db_base_set_dav_cache(db, local_abspath,
> - prop_hash_from_array(wc_props, pool),
> - pool));
> + return SVN_NO_ERROR;
> }
>
> /* Append, to LOG_ACCUM, log commands to update the entry for LOCAL_ABSPATH
>
>