You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2010/04/28 03:28:16 UTC
Re: svn commit: r33994 - in trunk/subversion: libsvn_client
libsvn_repos tests/cmdline
On Mon, Nov 3, 2008 at 19:42, Julian Foad <ju...@btopenworld.com> wrote:
> On Sat, 2008-11-01 at 09:44 -0700, sbutler@tigris.org wrote:
>> Author: sbutler
>> Date: Sat Nov 1 09:44:45 2008
>> New Revision: 33994
>>
>> Log:
>> In the client commit code, convert a "not found" error to the more
>> helpful "out of date" error.
>...
>> +++ trunk/subversion/libsvn_client/commit_util.c Sat Nov 1 09:44:45 2008 (r33994)
>...
>> @@ -1249,6 +1272,18 @@ do_item_commit(void **dir_baton,
>> }
>>
>> SVN_ERR(svn_wc_entry(&tmp_entry, item->path, adm_access, TRUE, pool));
>> +
>> + /* When committing a directory that no longer exists in the
>> + repository, a "not found" error does not occur immediately
>> + upon opening the directory. It appears here during the delta
>> + transmisssion. */
>> + err = svn_wc_transmit_prop_deltas
>> + (item->path, adm_access, tmp_entry, editor,
>> + (kind == svn_node_dir) ? *dir_baton : file_baton, NULL, pool);
>> +
>> + if (err)
>> + return fixup_out_of_date_error(path, kind, err);
>> +
>> SVN_ERR(svn_wc_transmit_prop_deltas
>> (item->path, adm_access, tmp_entry, editor,
>> (kind == svn_node_dir) ? *dir_baton : file_baton, NULL, pool));
>
> I'll query this: was that addition meant to replace, rather than
> duplicate, the "svn_wc_transmit_prop_deltas(...)" call which now appears
> twice?
This question was never answered, and I'm wondering the same thing.
Stephen: intentional, or not?
Cheers,
-g
Re: svn commit: r33994 - in trunk/subversion: libsvn_client libsvn_repos tests/cmdline
Posted by Stephen Butler <sb...@elego.de>.
On May 5, 2010, at 13:54 , Julian Foad wrote:
> On Tue, 2010-04-27, Greg Stein wrote:
>> On Mon, Nov 3, 2008 at 19:42, Julian Foad <ju...@btopenworld.com> wrote:
[...]
>>>
>>> I'll query this: was that addition meant to replace, rather than
>>> duplicate, the "svn_wc_transmit_prop_deltas(...)" call which now appears
>>> twice?
>>
>> This question was never answered, and I'm wondering the same thing.
>>
>> Stephen: intentional, or not?
>
> It's clear to me, from reading the code and the log message, that it was
> accidental, so I'm deleting the second call. I stepped through it and
> observed that the second call was making a no-op change, and ran the
> test suite.
>
> r941260.
>
> - Julian
Thanks, Julian. Sorry I missed this thread.
Steve
--
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Re: svn commit: r33994 - in trunk/subversion: libsvn_client
libsvn_repos tests/cmdline
Posted by Julian Foad <ju...@wandisco.com>.
On Tue, 2010-04-27, Greg Stein wrote:
> On Mon, Nov 3, 2008 at 19:42, Julian Foad <ju...@btopenworld.com> wrote:
> > On Sat, 2008-11-01 at 09:44 -0700, sbutler@tigris.org wrote:
> >> Author: sbutler
> >> Date: Sat Nov 1 09:44:45 2008
> >> New Revision: 33994
> >>
> >> Log:
> >> In the client commit code, convert a "not found" error to the more
> >> helpful "out of date" error.
> >...
> >> +++ trunk/subversion/libsvn_client/commit_util.c Sat Nov 1 09:44:45 2008 (r33994)
> >...
> >> @@ -1249,6 +1272,18 @@ do_item_commit(void **dir_baton,
> >> }
> >>
> >> SVN_ERR(svn_wc_entry(&tmp_entry, item->path, adm_access, TRUE, pool));
> >> +
> >> + /* When committing a directory that no longer exists in the
> >> + repository, a "not found" error does not occur immediately
> >> + upon opening the directory. It appears here during the delta
> >> + transmisssion. */
> >> + err = svn_wc_transmit_prop_deltas
> >> + (item->path, adm_access, tmp_entry, editor,
> >> + (kind == svn_node_dir) ? *dir_baton : file_baton, NULL, pool);
> >> +
> >> + if (err)
> >> + return fixup_out_of_date_error(path, kind, err);
> >> +
> >> SVN_ERR(svn_wc_transmit_prop_deltas
> >> (item->path, adm_access, tmp_entry, editor,
> >> (kind == svn_node_dir) ? *dir_baton : file_baton, NULL, pool));
> >
> > I'll query this: was that addition meant to replace, rather than
> > duplicate, the "svn_wc_transmit_prop_deltas(...)" call which now appears
> > twice?
>
> This question was never answered, and I'm wondering the same thing.
>
> Stephen: intentional, or not?
It's clear to me, from reading the code and the log message, that it was
accidental, so I'm deleting the second call. I stepped through it and
observed that the second call was making a no-op change, and ran the
test suite.
r941260.
- Julian