Author: hwright Date: Tue Jan 19 18:07:01 2010 New Revision: 900871 URL: http://svn.apache.org/viewvc?rev=900871&view=rev Log: Reintegrate the 1.6.x-1.6.8-serfassertion branch:
* ^/subversion/branches/1.6.x-1.6.8-serfassertion Fix the assertion as seen while running the tests over svn_ra_serf by canonicalizing the basecoll_url before returning it. See http://svn.haxx.se/dev/archive-2010-01/0295.shtml for discussion. Justification: Failing assertions are bad. Votes: +1: rhuijben, pburba, lgo Modified: subversion/branches/1.6.x/ (props changed) subversion/branches/1.6.x/CHANGES (props changed) subversion/branches/1.6.x/STATUS subversion/branches/1.6.x/subversion/libsvn_ra_serf/property.c Propchange: subversion/branches/1.6.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 19 18:07:01 2010 @@ -1,4 +1,5 @@ /subversion/branches/1.5.x-r30215:866657 +/subversion/branches/1.6.x-1.6.8-serfassertion:900822-900868 /subversion/branches/1.6.x-UNC-paths:872816-872890 /subversion/branches/1.6.x-dirent-basename:872475-872607 /subversion/branches/1.6.x-future-proof:880259-884209 Propchange: subversion/branches/1.6.x/CHANGES ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 19 18:07:01 2010 @@ -1,4 +1,5 @@ /subversion/branches/1.5.x-r30215/CHANGES:866657 +/subversion/branches/1.6.x-1.6.8-serfassertion/CHANGES:900822-900868 /subversion/branches/1.6.x-UNC-paths/CHANGES:872816-872890 /subversion/branches/1.6.x-dirent-basename/CHANGES:872475-872607 /subversion/branches/1.6.x-future-proof/CHANGES:880259-884209 Modified: subversion/branches/1.6.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=900871&r1=900870&r2=900871&view=diff ============================================================================== --- subversion/branches/1.6.x/STATUS (original) +++ subversion/branches/1.6.x/STATUS Tue Jan 19 18:07:01 2010 @@ -215,12 +215,3 @@ Approved changes: ================= - - * ^/subversion/branches/1.6.x-1.6.8-serfassertion - Fix the assertion as seen while running the tests over svn_ra_serf by - canonicalizing the basecoll_url before returning it. See - http://svn.haxx.se/dev/archive-2010-01/0295.shtml for discussion. - Justification: - Failing assertions are bad. - Votes: - +1: rhuijben, pburba, lgo Modified: subversion/branches/1.6.x/subversion/libsvn_ra_serf/property.c URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_ra_serf/property.c?rev=900871&r1=900870&r2=900871&view=diff ============================================================================== --- subversion/branches/1.6.x/subversion/libsvn_ra_serf/property.c (original) +++ subversion/branches/1.6.x/subversion/libsvn_ra_serf/property.c Tue Jan 19 18:07:01 2010 @@ -985,6 +985,8 @@ "requested baseline-collection value")); } + basecoll_url = svn_path_canonicalize(basecoll_url, pool); + if (latest_revnum) { const char *version_name;
