[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn commit: r1403588 - in /subversion/trunk/subversion: mod_dav_svn/reports/update.c tests/cmdline/update_tests.py

From: Bert Huijben <bert_at_qqmail.nl>
Date: Tue, 30 Oct 2012 13:58:01 +0100

> -----Original Message-----
> From: C. Michael Pilato [mailto:cmpilato_at_collab.net]
> Sent: dinsdag 30 oktober 2012 13:01
> To: Bert Huijben
> Cc: dev_at_subversion.apache.org
> Subject: Re: svn commit: r1403588 - in /subversion/trunk/subversion:
> mod_dav_svn/reports/update.c tests/cmdline/update_tests.py
>
> On 10/30/2012 06:46 AM, Bert Huijben wrote:
> >
> >
> >> -----Original Message-----
> >> From: cmpilato_at_apache.org [mailto:cmpilato_at_apache.org]
> >> Sent: dinsdag 30 oktober 2012 01:24
> >> To: commits_at_subversion.apache.org
> >> Subject: svn commit: r1403588 - in /subversion/trunk/subversion:
> >> mod_dav_svn/reports/update.c tests/cmdline/update_tests.py
> >>
> >> Author: cmpilato
> >> Date: Tue Oct 30 00:23:38 2012
> >> New Revision: 1403588
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1403588&view=rev
> >> Log:
> >> Tweak the server-side logic which validates update report source and
> >> target revision values so that they always get checked for validity,
> >> not only when doing non-client-pegged updates.
> >>
> >> * subversion/mod_dav_svn/reports/update.c
> >> (validate_input_revision): New helper function.
> >> (dav_svn__update_report): Always query the youngest FS revision, and
> >> use it (via validate_input_revision()) to raise errors when the
> >> client requests an update to a revision younger than is available
> >> or reports that it has objects whose revision is greater than the
> >> youngest.
> >
> > How hard would it be to port this one back to 1.7?
>
> I don't think it would be hard at all. I certainly plan to make the attempt
> today.

One of the reasons I was suggesting is that I was thinking that this code might also relate to the errors reported by temporarily out of sync proxies, but I now think those originate in the reporter handling.

>
> >> Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
> >> URL:
> >>
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/
> >> update_tests.py?rev=1403588&r1=1403587&r2=1403588&view=diff
> >>
> ==========================================================
> >> ====================
> >> --- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
> >> +++ subversion/trunk/subversion/tests/cmdline/update_tests.py Tue
> Oct 30
> >> 00:23:38 2012
> >> @@ -5516,7 +5516,7 @@ def update_to_HEAD_plus_1(sbox):
> >>
> >> svntest.actions.run_and_verify_update(wc_dir,
> >> None, None, None,
> >> - ".*No such revision",
> >> + ".*E160006",
> >
> > If possible, please also keep some part(s) of an error message in the regex,
> to make the testsuite verify that we keep failing for the same reason.
> > (In this case it checks for SVN_ERR_FS_NO_SUCH_REVISION, which already
> tells almost the whole story, but I don't see that in the test suite code)
>
> Good suggestion. The "No such revision ..." is now (for DAV servers) "No
> such [target|reported] revision ...". Would ".*No such.*revision" serve
> your desires here?

Yes great.
I think you could use "E160006.*No such.*revision".
(If I remember correctly we don't need a .* at the start.)

        Bert
Received on 2012-10-30 13:58:53 CET

This is an archived mail posted to the Subversion Dev mailing list.