svn propchange: r1181630 - svn:log

[gstein]

Author: gstein
Revision: 1181630
Modified property: svn:log

Modified: svn:log at Tue Oct 11 06:16:38 2011
--
--- svn:log (original)
+++ svn:log Tue Oct 11 06:16:38 2011
@@ -7,6 +7,7 @@ Various updates before people start slam
 - visualsvn link is not Apache Subversion binaries. axed.
 - apple link is for Xcode. maybe svn is in there somewhere, but
   non-obvious for users. axed.
+- Jeremy's AIX build is criminally old. note that.
 
 For further consideration: debian, sliksvn, ubuntu have 'svnserve' as the
 server install, so I didn't apply the 'client-only' label. But it would be

svn commit: r1181630 - /subversion/site/publish/packages.html

[gstein]

Author: gstein
Date: Tue Oct 11 06:14:02 2011
New Revision: 1181630

URL: http://svn.apache.org/viewvc?rev=1181630&view=rev
Log:
Various updates before people start slamming this page tomorrow :-P

- some referenced pages only provide the Apache Subversion client. note that.
- the Fedora page simply disappeared(!). link to the build page.
- sunfreeware didn't link directly to svn. when I found the link in the
  right column, after a few seconds, it redirect to a non-free page. axed.
- visualsvn link is not Apache Subversion binaries. axed.
- apple link is for Xcode. maybe svn is in there somewhere, but
  non-obvious for users. axed.

For further consideration: debian, sliksvn, ubuntu have 'svnserve' as the
server install, so I didn't apply the 'client-only' label. But it would be
nice if they could somehow link to an Apache (mod_dav_svn) install for the
users seeking that.

The opencsw site: it was unclear whether the package was client and/or
server. Clarification in the packaging and page would be good.

The SUSE build page is the same: it is entirely unclear what the hell that
package installs. Client? Server? As with the above, I've left this
pending some clarification.

The CollabNet links reference redhat.html, but end up redirecting to
linux.html. I did not change these in case CN planned on that and would
like to *not* redirect at some future point in time (ie. drop in a true
redhat.html).

* site/publish/packages.html: update, per above

Modified:
subversion/site/publish/packages.html

Modified: subversion/site/publish/packages.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/packages.html?rev=1181630&r1=1181629&r2=1181630&view=diff
==
--- subversion/site/publish/packages.html (original)
+++ subversion/site/publish/packages.html Tue Oct 11 06:14:02 2011
@@ -85,7 +85,7 @@
>Michael Perzl)
 
 http://downloads.open.collab.net/binaries.html";
-   >openCollabNet (maintained by
+   >openCollabNet (version 1.4.6; maintained by
mailto:facilitat...@svnbinaries.open.collab.net";
>Jeremy Whitlock; requires registration)
 
@@ -104,7 +104,7 @@
 
 
 http://www.collab.net/downloads/subversion/redhat.html";>
-CollabNet (supported and certified by
+CollabNet (client only; supported and certified by
http://www.collab.net/subversion";
>CollabNet; requires registration)
 
@@ -152,7 +152,7 @@
 
 
 
-https://admin.fedoraproject.org/pkgdb/packages/name/subversion";
+http://koji.fedoraproject.org/koji/packageinfo?packageID=752";
>Fedora Project (maintained by
https://admin.fedoraproject.org/pkgdb/users/packages/jorton";
>Joe Orton)
@@ -262,11 +262,8 @@ $ make install clean
mailto:facilitat...@svnbinaries.open.collab.net";
>Jeremy Whitlock; requires registration)
 
-http://developer.apple.com/tools/";
->Apple's Developer Tools (requires registration)
-
 http://www.wandisco.com/subversion/download#osx";>
-WANdisco (supported and certified by
+WANdisco (client only; supported and certified by
http://www.wandisco.com/";
>WANdisco; requires registration)
 
@@ -285,7 +282,7 @@ $ make install clean
 
 
 http://www.collab.net/downloads/subversion/redhat.html";>
-CollabNet (supported and certified by
+CollabNet (client only; supported and certified by
http://www.collab.net/subversion";
>CollabNet; requires registration)
 
@@ -313,15 +310,10 @@ $ make install clean
 
 
 http://www.collab.net/downloads/subversion/solaris.html";
-   >CollabNet (SPARC/x86; supported and certified by
+   >CollabNet (client only; SPARC/x86; supported and certified by
http://www.collab.net/subversion";
>CollabNet; requires registration)
 
-http://www.sunfreeware.com/";
-   >Sunfreeware (SPARC/i386; maintained by
-   mailto:st...@smc.vnet.net";
-   >Steven M. Christensen)
-
 http://www.opencsw.org/packages/subversion";
>OpenCSW (SPARC/i386;
http://www.opencsw.org/maintainers/rupert";
@@ -347,7 +339,7 @@ $ make install clean
 
 
 http://www.collab.net/downloads/subversion/redhat.html";>
-CollabNet (supported and certified by
+CollabNet (client only; supported and certified by
http://www.collab.net/subversion";
>CollabNet; requires registration)
 
@@ -400,7 +392,7 @@ $ make install clean
 
 
 http://www.collab.net/downloads/subversion/";
-   >CollabNet (supported and certified by
+   >CollabNet (client only; supported and certified by
http://www.collab.net/subversion";
>CollabNet; requires registration)
 
@@ -411,13 +403,8 @@ $ make install clean
http://sharpsvn.open.collab.net/";
>SharpSvn project)
 
-http://www.visualsvn.com/server";
-   >VisualSVN Server (Subversion server installer and management 
console; maintained by
-   http://www.visualsvn.com";
-   >Vi

svn commit: r1181609 - /subversion/trunk/subversion/libsvn_wc/status.c

[rhuijben]

Author: rhuijben
Date: Tue Oct 11 02:32:16 2011
New Revision: 1181609

URL: http://svn.apache.org/viewvc?rev=1181609&view=rev
Log:
Revert the removal of the calculations of repository paths of remotely added
nodes in r953751, by reintroducing similar code using repository relative paths.

This should fix the javahl test failure recently introduced by markphip.

* subversion/libsvn_wc/status.c
  (dir_baton, file_baton): Add repos_relpath field.
  (tweak_statushash): Fill repos_relpath from baton if not already read from
the working copy.
  (make_dir_baton, make_file_baton): Calculate and store repos_relpath.

Found by: markphip
  philip

Modified:
subversion/trunk/subversion/libsvn_wc/status.c

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1181609&r1=1181608&r2=1181609&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue Oct 11 02:32:16 2011
@@ -184,6 +184,9 @@ struct dir_baton
   /* The pool in which this baton itself is allocated. */
   apr_pool_t *pool;
 
+  /* The repository root relative path to this item in the repository. */
+  const char *repos_relpath;
+
   /* out-of-date info corresponding to ood_* fields in svn_wc_status3_t. */
   svn_node_kind_t ood_kind;
   svn_revnum_t ood_changed_rev;
@@ -223,6 +226,9 @@ struct file_baton
  the code that syncs up the adm dir and working copy. */
   svn_boolean_t prop_changed;
 
+  /* The repository root relative path to this item in the repository. */
+  const char *repos_relpath;
+
   /* out-of-date info corresponding to ood_* fields in svn_wc_status3_t. */
   svn_node_kind_t ood_kind;
   svn_revnum_t ood_changed_rev;
@@ -1573,6 +1579,27 @@ tweak_statushash(void *baton,
 {
   struct dir_baton *b = this_dir_baton;
 
+  if (!statstruct->repos_relpath && b->repos_relpath)
+{
+  if (statstruct->repos_node_status == svn_wc_status_deleted)
+{
+  /* When deleting PATH, BATON is for PATH's parent,
+ so we must construct PATH's real statstruct->url. */
+  statstruct->repos_relpath =
+svn_relpath_join(b->repos_relpath,
+ svn_dirent_basename(local_abspath,
+ NULL),
+ pool);
+}
+  else
+statstruct->repos_relpath = apr_pstrdup(pool, b->repos_relpath);
+
+  statstruct->repos_root_url = 
+  b->edit_baton->anchor_status->repos_root_url;
+  statstruct->repos_uuid = 
+  b->edit_baton->anchor_status->repos_uuid;
+}
+
   /* The last committed date, and author for deleted items
  isn't available. */
   if (statstruct->repos_node_status == svn_wc_status_deleted)
@@ -1606,6 +1633,14 @@ tweak_statushash(void *baton,
   struct file_baton *b = baton;
   statstruct->ood_changed_rev = b->ood_changed_rev;
   statstruct->ood_changed_date = b->ood_changed_date;
+  if (!statstruct->repos_relpath && b->repos_relpath)
+{
+  statstruct->repos_relpath = apr_pstrdup(pool, b->repos_relpath);
+  statstruct->repos_root_url =
+  b->edit_baton->anchor_status->repos_root_url;
+  statstruct->repos_uuid =
+  b->edit_baton->anchor_status->repos_uuid;
+}
   statstruct->ood_kind = b->ood_kind;
   if (b->ood_changed_author)
 statstruct->ood_changed_author =
@@ -1628,9 +1663,9 @@ find_dir_repos_relpath(const struct dir_
   const svn_wc_status3_t *status = apr_hash_get(pb->statii,
 db->local_abspath,
 APR_HASH_KEY_STRING);
-  /* Note that status->url is NULL in the case of a missing
-   * directory, which means we need to recurse up another level to
-   * get a useful URL. */
+  /* Note that status->repos_relpath could be NULL in the case of a missing
+   * directory, which means we need to recurse up another level to get
+   * a useful relpath. */
   if (status)
 return status->repos_relpath;
 
@@ -1675,6 +1710,7 @@ make_dir_baton(void **dir_baton,
   d->statii = apr_hash_make(pool);
   d->ood_changed_rev = SVN_INVALID_REVNUM;
   d->ood_changed_date = 0;
+  d->repos_relpath = apr_pstrdup(pool, find_dir_repos_relpath(d, pool));
   d->ood_kind = svn_node_dir;
   d->ood_changed_author = NULL;
 
@@ -1768,6 +1804,8 @@ make_file_baton(struct dir_baton *parent
   f->edit_baton = eb;
   f->ood_changed_rev = SVN_INVALID_REVNUM;
   f->ood_changed_date = 0;
+  f->repos_relpath = svn_relpath_join(find_dir_repos_rel

svn propchange: r1174582 - svn:log

[rhuijben]

Author: rhuijben
Revision: 1174582
Modified property: svn:log

Modified: svn:log at Tue Oct 11 01:23:51 2011
--
--- svn:log (original)
+++ svn:log Tue Oct 11 01:23:51 2011
@@ -1,5 +1,5 @@
 Follow-up to r1171353.
 * subversion/libsvn_wc/status.c (one_child_status):
-Use correct node kind const. No functional change expected, since by
+Use correct node kind enum. No functional change expected, since by
 coincidence, svn_node_unknown == svn_wc__db_kind_unknown == 3.
 Found by: philip

svn commit: r1181326 - /subversion/trunk/tools/dist/templates/stable-news.ezt

[hwright]

Author: hwright
Date: Tue Oct 11 01:08:07 2011
New Revision: 1181326

URL: http://svn.apache.org/viewvc?rev=1181326&view=rev
Log:
* tools/dist/templates/stable-news.ezt:
  Correct a link to the stable release.

Found by: danielsh

Modified:
subversion/trunk/tools/dist/templates/stable-news.ezt

Modified: subversion/trunk/tools/dist/templates/stable-news.ezt
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/stable-news.ezt?rev=1181326&r1=1181325&r2=1181326&view=diff
==
--- subversion/trunk/tools/dist/templates/stable-news.ezt (original)
+++ subversion/trunk/tools/dist/templates/stable-news.ezt Tue Oct 11 01:08:07 
2011
@@ -13,7 +13,7 @@
change log for information about this release. 
  
 To get this release from the nearest mirror, please visit our
-   download page. 
+   download page. 
  
   
 

Re: svn commit: r1181166 - in /subversion/branches/1.5.x: ./ STATUS subversion/mod_dav_svn/repos.c

[Daniel Shahaf]

hwri...@apache.org wrote on Mon, Oct 10, 2011 at 19:39:30 -:
> Author: hwright
> Date: Mon Oct 10 19:39:30 2011
> New Revision: 1181166
> 
> URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
> Log:
> * STATUS: Note the deletion rev of a few old branches, in case folks wish
> to resurrect them some day.
> 
> Modified:
> subversion/branches/1.5.x/   (props changed)
> subversion/branches/1.5.x/STATUS
> subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
> 
> Propchange: subversion/branches/1.5.x/
> --
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Oct 10 19:39:30 2011
> @@ -35,4 +35,4 @@
>  /subversion/branches/reintegrate-improvements:873853-874164
>  /subversion/branches/svn-mergeinfo-enhancements:870196
>  /subversion/branches/svnpatch-diff:871905
> -/subversion/trunk:1041438
> +/subversion/trunk:1041438,1098608

This mergeinfo change has not been reverted.

svn commit: r1181233 - /subversion/trunk/tools/dist/release.py

[hwright]

Author: hwright
Date: Mon Oct 10 20:51:12 2011
New Revision: 1181233

URL: http://svn.apache.org/viewvc?rev=1181233&view=rev
Log:
* tools/dist/release.py
  (check_sigs): Update a directory reference.

Modified:
subversion/trunk/tools/dist/release.py

Modified: subversion/trunk/tools/dist/release.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1181233&r1=1181232&r2=1181233&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Oct 10 20:51:12 2011
@@ -626,7 +626,7 @@ def check_sigs(args):
 target = args.target
 else:
 target = os.path.join(os.getenv('HOME'), 'public_html', 'svn',
-  str(args.version), 'deploy')
+  str(args.version))
 
 good_sigs = {}
 

svn commit: r1181232 - /subversion/trunk/tools/dist/templates/stable-news.ezt

[hwright]

Author: hwright
Date: Mon Oct 10 20:50:35 2011
New Revision: 1181232

URL: http://svn.apache.org/viewvc?rev=1181232&view=rev
Log:
Add a news template for stable releases.

* tools/dist/templates/stable-news.ezt:
  New.

Added:
subversion/trunk/tools/dist/templates/stable-news.ezt

Added: subversion/trunk/tools/dist/templates/stable-news.ezt
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/stable-news.ezt?rev=1181232&view=auto
==
--- subversion/trunk/tools/dist/templates/stable-news.ezt (added)
+++ subversion/trunk/tools/dist/templates/stable-news.ezt Mon Oct 10 20:50:35 
2011
@@ -0,0 +1,19 @@
+ 
+[date_pres] — Apache Subversion [version] Released
+  ¶ 
+ 
+ 
+We are pleased to announce to release of Apache Subversion [version].  This
+   is the most complete Subversion release to date, and we encourage users
+   of Subversion to upgrade as soon as reasonable.  Please see the
+   release
+   announcement for more information about this release, and the
+   http://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES";> 
+   change log for information about this release. 
+ 
+To get this release from the nearest mirror, please visit our
+   download page. 
+ 
+  
+

svn commit: r1181215 - in /subversion/trunk/subversion: libsvn_subr/sorts.c tests/libsvn_subr/mergeinfo-test.c

[pburba]

Author: pburba
Date: Mon Oct 10 20:22:06 2011
New Revision: 1181215

URL: http://svn.apache.org/viewvc?rev=1181215&view=rev
Log:
The *rest* of r1181090!  

* subversion/libsvn_subr/sorts.c

  (svn_sort__array_delete): Don't assume we are only removing one element;
   since r1181090 we may remove many.

* subversion/tests/libsvn_subr/mergeinfo-test.c

  (test_rangelist_merge): Add a test that exercises the above modified block.

Modified:
subversion/trunk/subversion/libsvn_subr/sorts.c
subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c

Modified: subversion/trunk/subversion/libsvn_subr/sorts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sorts.c?rev=1181215&r1=1181214&r2=1181215&view=diff
==
--- subversion/trunk/subversion/libsvn_subr/sorts.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sorts.c Mon Oct 10 20:22:06 2011
@@ -269,11 +269,11 @@ svn_sort__array_delete(apr_array_header_
 }
   else
 {
-  memmove(arr->elts + arr->elt_size * delete_index,
-  arr->elts + arr->elt_size * (delete_index + 1),
-  arr->elt_size * (arr->nelts - 1 - delete_index)
-  * elements_to_delete);
-  --(arr->nelts);
+  memmove(
+arr->elts + arr->elt_size * delete_index,
+arr->elts + (arr->elt_size * (delete_index + elements_to_delete)),
+arr->elt_size * (arr->nelts - elements_to_delete - delete_index));
+  arr->nelts -= elements_to_delete;
 }
 }
 }

Modified: subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1181215&r1=1181214&r2=1181215&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Mon Oct 10 
20:22:06 2011
@@ -1181,7 +1181,7 @@ test_rangelist_merge(apr_pool_t *pool)
 svn_merge_range_t expected_merge[6];
   };
 
-  #define SIZE_OF_RANGE_MERGE_TEST_ARRAY 67
+  #define SIZE_OF_RANGE_MERGE_TEST_ARRAY 68
   /* The actual test data. */
   struct rangelist_merge_test_data test_data[SIZE_OF_RANGE_MERGE_TEST_ARRAY] =
 {
@@ -1286,6 +1286,9 @@ test_rangelist_merge(apr_pool_t *pool)
 
   {"/A: 5-60", "/A: 3-4,50-100*", 2, {{2, 60, TRUE}, {60, 100, FALSE}}},
 
+  {"/A: 5,9,11-15,17,200-300,999", "/A: 7-50", 4,
+   {{4, 5, TRUE}, {6, 50, TRUE}, {199, 300, TRUE}, {998, 999, TRUE}}},
+
   /* A rangelist merged with an empty rangelist should equal the
  non-empty rangelist but in compacted form. */
   {"/A: 1-44,45,46,47-50",   "",  1, {{ 0, 50, TRUE }}},

svn commit: r1181186 - in /subversion/branches/1.7.x: ./ INSTALL

[hwright]

Author: hwright
Date: Mon Oct 10 19:58:00 2011
New Revision: 1181186

URL: http://svn.apache.org/viewvc?rev=1181186&view=rev
Log:
Merge r1181155 from trunk, citing the "obvious fix" documentation rule:

* INSTALL: Remove more references to the -deps tarballs, which aren't shipping
with 1.7.0.

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/INSTALL

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 19:58:00 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1177001,1177492,1179680,1179767
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1177001,1177492,1179680,1179767,1181155

Modified: subversion/branches/1.7.x/INSTALL
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/INSTALL?rev=1181186&r1=1181185&r2=1181186&view=diff
==
--- subversion/branches/1.7.x/INSTALL (original)
+++ subversion/branches/1.7.x/INSTALL Mon Oct 10 19:58:00 2011
@@ -190,10 +190,7 @@ I.INTRODUCTION
 
   Whenever you want to build any part of Subversion, you need the
   Apache Portable Runtime (APR) and the APR Utility (APR-util)
-  libraries. These are included in the Subversion dependency pa

svn commit: r1181184 - in /subversion/branches/1.7.x: ./ STATUS build/ac-macros/zlib.m4

[hwright]

Author: hwright
Date: Mon Oct 10 19:56:59 2011
New Revision: 1181184

URL: http://svn.apache.org/viewvc?rev=1181184&view=rev
Log:
Merge r1174806 from trunk:

 * r1174806
   Fix LDFLAGS when --with-zlib is passed with an argument.
   Justification:
 Might save a poor soul from lots of debugging some day.
   Votes:
 +1: danielsh, jerenkrantz, hwright

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build/ac-macros/zlib.m4

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 19:56:59 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1175888,1177001,1177492,1179680,1179767
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1177001,1177492,1179680,1179767

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181184&r1=1181183&r2=1181184&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 19:56:59 2011
@@ -114,10 +114,3 @@ Veto-blocked changes:
 
 Approved changes:
 =
-
- * r1174806
-   Fix LDFLAGS when --with-zlib is passed with an argume

svn commit: r1181182 - in /subversion/branches/1.7.x: ./ STATUS build/ac-macros/zlib.m4

[hwright]

Author: hwright
Date: Mon Oct 10 19:56:19 2011
New Revision: 1181182

URL: http://svn.apache.org/viewvc?rev=1181182&view=rev
Log:
Merge r1174798 from trunk:

 * r1174798
   DTRT when --with-zlib is passed without an argument.
   Justification:
 This DTRTing is normal for other --with-* options.
   Votes:
 +1: danielsh, jerenkrantz, hwright

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build/ac-macros/zlib.m4

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 19:56:19 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797,1175888,1177001,1177492,1179680,1179767
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1175888,1177001,1177492,1179680,1179767

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181182&r1=1181181&r2=1181182&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 19:56:19 2011
@@ -115,13 +115,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1174798
-   DTRT when --with-zlib is passed without an argument.
-   Justification:
- Th

svn commit: r1181179 - in /subversion/branches/1.7.x: ./ STATUS build/ac-macros/zlib.m4

[hwright]

Author: hwright
Date: Mon Oct 10 19:55:44 2011
New Revision: 1181179

URL: http://svn.apache.org/viewvc?rev=1181179&view=rev
Log:
Merge r1174761 from trunk:

 * r1174761
   Better error message when configuring --without-zlib.
   Votes:
 +1: danielsh, jerenkrantz, hwright

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build/ac-macros/zlib.m4

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 19:55:44 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001,1177492,1179680,1179767
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797,1175888,1177001,1177492,1179680,1179767

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181179&r1=1181178&r2=1181179&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 19:55:44 2011
@@ -115,11 +115,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1174761
-   Better error message when configuring --without-zlib.
-   Votes:
- +1: danielsh, jerenkrantz, hwright
-
  * r1174798
DTRT when --with-zlib is passed without an a

svn commit: r1181178 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/io.c

[hwright]

Author: hwright
Date: Mon Oct 10 19:54:49 2011
New Revision: 1181178

URL: http://svn.apache.org/viewvc?rev=1181178&view=rev
Log:
Merge r1177492 from trunk:

 * r1177492
   Constness fix.
   Justification:
 Without this we are writing to const memory.
   Votes:
 +1: danielsh, stsp, hwright

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_subr/io.c

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 19:54:49 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001,1179680,1179767
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001,1177492,1179680,1179767

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181178&r1=1181177&r2=1181178&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 19:54:49 2011
@@ -115,13 +115,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1177492
-   Constness fix.
-   Justification:
- Without this we are writing to const memory.
-   Votes:
- +1: danielsh, stsp, hwright
-
  * r1174761
Better err

svn commit: r1181177 - /subversion/branches/1.7.x/STATUS

[hwright]

Author: hwright
Date: Mon Oct 10 19:52:10 2011
New Revision: 1181177

URL: http://svn.apache.org/viewvc?rev=1181177&view=rev
Log:
* STATUS: Cast some votes.

Modified:
subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181177&r1=1181176&r2=1181177&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 19:52:10 2011
@@ -82,32 +82,6 @@ Candidate changes:
  if the backport is done that way).
  +1: danielsh (conditioned upon the backport done as per Paul's comment)
 
- * r1174761
-   Better error message when configuring --without-zlib.
-   Votes:
- +1: danielsh, jerenkrantz
-
- * r1174798
-   DTRT when --with-zlib is passed without an argument.
-   Justification:
- This DTRTing is normal for other --with-* options.
-   Votes:
- +1: danielsh, jerenkrantz
-
- * r1174806
-   Fix LDFLAGS when --with-zlib is passed with an argument.
-   Justification:
- Might save a poor soul from lots of debugging some day.
-   Votes:
- +1: danielsh, jerenkrantz
-
- * r1177492
-   Constness fix.
-   Justification:
- Without this we are writing to const memory.
-   Votes:
- +1: danielsh, stsp
-
  * r1167681
Don't invoke quicksort unnecessarily when combining mergeinfo rangelists.
Justification:
@@ -121,7 +95,7 @@ Candidate changes:
Justification:
  Should reduce memory footprint.
Votes:
- +1: stsp
+ +1: stsp, hwright
 
  * r1178280, r1178282
Add a sanity check to FSFS.
@@ -133,10 +107,36 @@ Candidate changes:
  * r1153540, r1153566
Silence a build warning.
Votes:
- +1: danielsh
+ +1: danielsh, hwright
 
 Veto-blocked changes:
 =
 
 Approved changes:
 =
+
+ * r1177492
+   Constness fix.
+   Justification:
+ Without this we are writing to const memory.
+   Votes:
+ +1: danielsh, stsp, hwright
+
+ * r1174761
+   Better error message when configuring --without-zlib.
+   Votes:
+ +1: danielsh, jerenkrantz, hwright
+
+ * r1174798
+   DTRT when --with-zlib is passed without an argument.
+   Justification:
+ This DTRTing is normal for other --with-* options.
+   Votes:
+ +1: danielsh, jerenkrantz, hwright
+
+ * r1174806
+   Fix LDFLAGS when --with-zlib is passed with an argument.
+   Justification:
+ Might save a poor soul from lots of debugging some day.
+   Votes:
+ +1: danielsh, jerenkrantz, hwright

svn propchange: r1181166 - svn:log

[hwright]

Author: hwright
Revision: 1181166
Modified property: svn:log

Modified: svn:log at Mon Oct 10 19:42:07 2011
--
--- svn:log (original)
+++ svn:log Mon Oct 10 19:42:07 2011
@@ -1,2 +1,5 @@
 * STATUS: Note the deletion rev of a few old branches, in case folks wish
 to resurrect them some day.
+
+[ Note: Changes to subversion/mod_dav_svn/repos.c were non-intentional, and
+  reverted in r1181169. ]

svn commit: r1181169 - /subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c

[hwright]

Author: hwright
Date: Mon Oct 10 19:41:22 2011
New Revision: 1181169

URL: http://svn.apache.org/viewvc?rev=1181169&view=rev
Log:
* subversion/mod_dav_svn/repos.c:
  Revert changes accidentally committed in r1181166.

Modified:
subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c

Modified: subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c?rev=1181169&r1=1181168&r2=1181169&view=diff
==
--- subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c Mon Oct 10 
19:41:22 2011
@@ -2649,11 +2649,10 @@ deliver(const dav_resource *resource, ap
   apr_status_t status;
 
   /* Check resource type */
-  if (resource->baselined
-  || (resource->type != DAV_RESOURCE_TYPE_REGULAR
-  && resource->type != DAV_RESOURCE_TYPE_VERSION
-  && resource->type != DAV_RESOURCE_TYPE_WORKING
-  && resource->info->restype != DAV_SVN_RESTYPE_PARENTPATH_COLLECTION))
+  if (resource->type != DAV_RESOURCE_TYPE_REGULAR
+  && resource->type != DAV_RESOURCE_TYPE_VERSION
+  && resource->type != DAV_RESOURCE_TYPE_WORKING
+  && resource->info->restype != DAV_SVN_RESTYPE_PARENTPATH_COLLECTION)
 {
   return dav_new_error(resource->pool, HTTP_CONFLICT, 0,
"Cannot GET this type of resource.");

svn commit: r1181166 - in /subversion/branches/1.5.x: ./ STATUS subversion/mod_dav_svn/repos.c

[hwright]

Author: hwright
Date: Mon Oct 10 19:39:30 2011
New Revision: 1181166

URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
Log:
* STATUS: Note the deletion rev of a few old branches, in case folks wish
to resurrect them some day.

Modified:
subversion/branches/1.5.x/   (props changed)
subversion/branches/1.5.x/STATUS
subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c

Propchange: subversion/branches/1.5.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 19:39:30 2011
@@ -35,4 +35,4 @@
 /subversion/branches/reintegrate-improvements:873853-874164
 /subversion/branches/svn-mergeinfo-enhancements:870196
 /subversion/branches/svnpatch-diff:871905
-/subversion/trunk:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869841,869843-869844,86985
 
8,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,86,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,870647,870657,870665,870671,
 
870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649,871668,871675,871677,87
 
1693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,8739
 
40,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,87489

svn commit: r1181163 - in /subversion/branches: 1.5.x-issue3392/ 1.5.x-r37137/ 1.5.x-r37779/ 1.5.x-r39109/ 1.5.x-r40200/ 1.5.x-r902467/

[hwright]

Author: hwright
Date: Mon Oct 10 19:37:04 2011
New Revision: 1181163

URL: http://svn.apache.org/viewvc?rev=1181163&view=rev
Log:
Remove a few unlikely-to-be-merged conflict resolution branches for
the 1.5.x line.

See http://svn.haxx.se/dev/archive-2008-09/0656.shtml for the rationale.

Removed:
subversion/branches/1.5.x-issue3392/
subversion/branches/1.5.x-r37137/
subversion/branches/1.5.x-r37779/
subversion/branches/1.5.x-r39109/
subversion/branches/1.5.x-r40200/
subversion/branches/1.5.x-r902467/

svn commit: r1181162 - in /subversion/branches: 1.5.x-issue2489/ 1.5.x-r37646/ 1.5.x-serf-config/

[hwright]

Author: hwright
Date: Mon Oct 10 19:35:25 2011
New Revision: 1181162

URL: http://svn.apache.org/viewvc?rev=1181162&view=rev
Log:
Remove few branches no longer listed in 1.5.x/STATUS.

Removed:
subversion/branches/1.5.x-issue2489/
subversion/branches/1.5.x-r37646/
subversion/branches/1.5.x-serf-config/

svn commit: r1181155 - /subversion/trunk/INSTALL

[hwright]

Author: hwright
Date: Mon Oct 10 19:23:04 2011
New Revision: 1181155

URL: http://svn.apache.org/viewvc?rev=1181155&view=rev
Log:
* INSTALL: Remove more references to the -deps tarballs, which aren't shipping
with 1.7.0.

Found by: Barry Scott 

Modified:
subversion/trunk/INSTALL

Modified: subversion/trunk/INSTALL
URL: 
http://svn.apache.org/viewvc/subversion/trunk/INSTALL?rev=1181155&r1=1181154&r2=1181155&view=diff
==
--- subversion/trunk/INSTALL (original)
+++ subversion/trunk/INSTALL Mon Oct 10 19:23:04 2011
@@ -195,10 +195,7 @@ I.INTRODUCTION
 
   Whenever you want to build any part of Subversion, you need the
   Apache Portable Runtime (APR) and the APR Utility (APR-util)
-  libraries. These are included in the Subversion dependency package -
-  if you are building from a source tarball and wish to use the versions
-  of APR and APR-util included there, just unpack the dependency package
-  and skip ahead to the next requirement.
+  libraries.
 
 
 
@@ -233,7 +230,7 @@ I.INTRODUCTION
 | Note that it's *perfectly* safe to use APR 1.X from the  |
 | beginning.  In fact, we recommend it.  If you're building|
 | Subversion for the first time, there's no compatibility  |
-| issue to worry about, so grab the latest version of APR.
+| issue to worry about, so grab the latest version of APR. |
 |  |
 | If you already have a Subversion installation using APR  |
 | 0.9.x, it's still possible to move to APR 1.X safely.  Just  |
@@ -242,8 +239,8 @@ I.INTRODUCTION
 |__|
 
 
-  If you are not building from a tarball with the dependency
-  package, you will need to get these yourself:
+  If you do not have a pre-installed APR and APR-util, you will need
+  to get these yourself:
 
   http://apr.apache.org/download.cgi
 
@@ -737,7 +734,7 @@ II.   INSTALLATION
   of the libsvn_* libraries.
 
   Note that if you commonly build with the -jN option to make and
-  have unpacked a dependency tarball into your checkout, the make
+  have used the get-deps.sh script to fetch dependencies, the make
   step above may fail, because we don't ensure that third party
   libraries in our source tree will finish building before
   subversion itself.  If you want to use -jN, use the following

svn commit: r1181134 - in /subversion/branches/1.7.x: ./ STATUS subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java subversion/bindings/javahl/src/org/tigris/subversion/javahl/SV

[hwright]

Author: hwright
Date: Mon Oct 10 18:49:39 2011
New Revision: 1181134

URL: http://svn.apache.org/viewvc?rev=1181134&view=rev
Log:
Merge r1179680 from trunk:

 * r1179680
   Fix javahl org.tigris.subversion to avoid double finalize.
   Justification:
 A double C++ delete can cause the JVM to SEGV.
   Votes:
 +1: philip, rhuijben

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS

subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java

subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:49:39 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001,1179767
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001,1179680,1179767

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181134&r1=1181133&r2=1181134&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:49:39 2011
@@ -140,10 +140,3 @@ Veto-blocked changes:
 
 Approved changes:
 =

svn commit: r1181132 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_svn/cyrus_auth.c

[hwright]

Author: hwright
Date: Mon Oct 10 18:48:53 2011
New Revision: 1181132

URL: http://svn.apache.org/viewvc?rev=1181132&view=rev
Log:
Merge r1179767 from trunk:

 * r1179767
   Prefix SASL error messages with a prefix that identifies them as such.
   Justification:
 Avoids silly error messages like "svn: generic failure".
 Reported on users@.
   Notes:
  would also be +1 on a follow-up that adds APR_INLINE.
   Votes:
 +1: stsp, danielsh, rhuijben

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_svn/cyrus_auth.c

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:48:53 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001,1179767

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181132&r1=1181131&r2=1181132&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:48:53 2011
@@ -141,16 +141,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1179767
-   Prefix SASL error

svn commit: r1181131 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_serf/ra_serf.h subversion/libsvn_ra_serf/serf.c

[hwright]

Author: hwright
Date: Mon Oct 10 18:47:00 2011
New Revision: 1181131

URL: http://svn.apache.org/viewvc?rev=1181131&view=rev
Log:
Merge r1154278, r1154379, r1154382 from trunk:

 * r1154278, r1154379, r1154382
   Make 'svn ls' capable of listing Subversion 1.0-1.3 repositories using
   ra_serf.
   Justification:
 We promised not to break backwards compatibility and it is not nice
 that serf doesn't want to list the neon repository.
 (Check svn ls http://svn.webdav.org/repos/projects/neon/)
   Notes:
 r1154278 is a quick hack to detect old servers and to at least return
  some information.
 r1154379 is the real fix: fallback to a more compatible request.
 r1154382 makes sure the right result is used directly after falling
  back from svn_ra_serf__get_dir.
  (Most likely the problem is detected earlier than this function)
   Votes:
 +1: rhuijben, cmpilato, jerenkrantz

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/1.7.x/subversion/libsvn_ra_serf/serf.c

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:47:00 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
 
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1

svn commit: r1181129 - in /subversion/branches/1.7.x: ./ STATUS subversion/bindings/javahl/native/File.cpp

[hwright]

Author: hwright
Date: Mon Oct 10 18:43:13 2011
New Revision: 1181129

URL: http://svn.apache.org/viewvc?rev=1181129&view=rev
Log:
Merge r1175888 from trunk:

 * r1175888
   Fix some object lifetime issues in the JavaHL bindings.
   Justification:
 Using garbage-collected objects is bad.
   Votes:
 +1: hwright, philip

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/javahl/native/File.cpp

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:43:13 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1177001
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181129&r1=1181128&r2=1181129&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:43:13 2011
@@ -141,13 +141,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1175888
-   Fix some object lifetime issues in the JavaHL bindings.
-   Justification:
- Using garbage-collected objects is bad.
-   Votes:
- +1: hwright, philip
-
  * r1154278, r1154379, r1154382
Make 'svn ls' c

svn commit: r1181128 - in /subversion/branches/1.7.x: ./ STATUS tools/client-side/bash_completion tools/client-side/bash_completion_test

[hwright]

Author: hwright
Date: Mon Oct 10 18:42:02 2011
New Revision: 1181128

URL: http://svn.apache.org/viewvc?rev=1181128&view=rev
Log:
Merge r1177001 from trunk:

 * r1177001
   Update bash_completion to match 1.7 commands and options.
   Justification:
 Frustrating to be offered the wrong options.
   Votes:
 +1: philip
 +0: danielsh

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/tools/client-side/bash_completion
subversion/branches/1.7.x/tools/client-side/bash_completion_test

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:42:02 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1177001

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181128&r1=1181127&r2=1181128&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:42:02 2011
@@ -141,14 +141,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1177001
-   Update bash_completion to match 1.7 commands and options.
-   Justification:
- Frustrating to be offered the wrong options.
-   Votes:
- +1: phi

svn commit: r1181126 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/sorts.c

[hwright]

Author: hwright
Date: Mon Oct 10 18:40:41 2011
New Revision: 1181126

URL: http://svn.apache.org/viewvc?rev=1181126&view=rev
Log:
Merge r1167659 from trunk:

 * r1167659
   Don't sort an already sorted array in svn_sort__hash().
   Justification:
 Possible performance improvement for merges, and doesn't cost anything.
 This function is used to sort mergeinfo catalogs, among other things.
   Votes:
 +1: stsp, rhuijben, pburba

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_subr/sorts.c

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:40:41 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181126&r1=1181125&r2=1181126&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:40:41 2011
@@ -141,14 +141,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1167659
-   Don't sort an already sorted array in svn_sort__hash().
-   Justification:
- Possible performance improvement for merges, and doesn't cost

svn commit: r1181121 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/info.c

[hwright]

Author: hwright
Date: Mon Oct 10 18:35:56 2011
New Revision: 1181121

URL: http://svn.apache.org/viewvc?rev=1181121&view=rev
Log:
Merge r1164386 from trunk:

 * r1164386
   Avoid an expensive database operation in 'svn info'.
   Justification:
 Improves performance of 'svn info' on a single unmodified node by 20-30%, 
by
 moving an in most cases unneeded database call in the error handling.
   Votes:
 +1: rhuijben, hwright, gstein

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/info.c

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:35:56 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
 
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181121&r1=1181120&r2=1181121&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:35:56 2011
@@ -141,14 +141,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1164386
-   Avoid an expensive database operation in 'svn info'.
-   Justification:
- Improves performance of 'svn info' on a single unmodified node by 20-30%, 
by

svn commit: r1181117 - /subversion/branches/1.7.x/STATUS

[hwright]

Author: hwright
Date: Mon Oct 10 18:30:21 2011
New Revision: 1181117

URL: http://svn.apache.org/viewvc?rev=1181117&view=rev
Log:
* STATUS: Remove admonition not to merge stuff prior to 1.7.1.

Modified:
subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181117&r1=1181116&r2=1181117&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:30:21 2011
@@ -141,8 +141,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
-[ Note: Please don't merge these until after 1.7.0 is released, just in case. ]
-
  * r1164386
Avoid an expensive database operation in 'svn info'.
Justification:

svn commit: r1181116 - /subversion/branches/1.7.x/subversion/include/svn_version.h

[hwright]

Author: hwright
Date: Mon Oct 10 18:29:43 2011
New Revision: 1181116

URL: http://svn.apache.org/viewvc?rev=1181116&view=rev
Log:
Bump the version number.

* subversion/include/svn_version.h:
  Bump to 1.7.1.

Modified:
subversion/branches/1.7.x/subversion/include/svn_version.h

Modified: subversion/branches/1.7.x/subversion/include/svn_version.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/include/svn_version.h?rev=1181116&r1=1181115&r2=1181116&view=diff
==
--- subversion/branches/1.7.x/subversion/include/svn_version.h (original)
+++ subversion/branches/1.7.x/subversion/include/svn_version.h Mon Oct 10 
18:29:43 2011
@@ -71,7 +71,7 @@ extern "C" {
  *
  * @since New in 1.1.
  */
-#define SVN_VER_PATCH  0
+#define SVN_VER_PATCH  1
 
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */

svn commit: r1181110 - /subversion/trunk/subversion/include/svn_sorts.h

[pburba]

Author: pburba
Date: Mon Oct 10 18:16:25 2011
New Revision: 1181110

URL: http://svn.apache.org/viewvc?rev=1181110&view=rev
Log:
* subversion/include/svn_sorts.h
  (svn_sort__array_delete): Fix documentation typo.

Modified:
subversion/trunk/subversion/include/svn_sorts.h

Modified: subversion/trunk/subversion/include/svn_sorts.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_sorts.h?rev=1181110&r1=1181109&r2=1181110&view=diff
==
--- subversion/trunk/subversion/include/svn_sorts.h (original)
+++ subversion/trunk/subversion/include/svn_sorts.h Mon Oct 10 18:16:25 2011
@@ -185,7 +185,7 @@ svn_sort__array_insert(const void *new_e
 /* Remove ELEMENTS_TO_DELETE elements starting  at DELETE_INDEX from the
array ARR. If DELETE_INDEX is not a valid element of ARR,
ELEMENTS_TO_DELETE is not greater than zero, or
-   DELETE_INDEX + ELEMENTS_TO_DELETE is grater than ARR->NELTS, then do
+   DELETE_INDEX + ELEMENTS_TO_DELETE is greater than ARR->NELTS, then do
nothing. */
 void
 svn_sort__array_delete(apr_array_header_t *arr,

svn commit: r1181106 - in /subversion/tags/1.7.0: ./ subversion/include/svn_version.h

[hwright]

Author: hwright
Date: Mon Oct 10 18:05:37 2011
New Revision: 1181106

URL: http://svn.apache.org/viewvc?rev=1181106&view=rev
Log:
Tagging 1.7.0 release with svn_version.h matching tarball.

Added:
subversion/tags/1.7.0/   (props changed)
  - copied from r1176462, subversion/branches/1.7.x/
Modified:
subversion/tags/1.7.0/subversion/include/svn_version.h

Propchange: subversion/tags/1.7.0/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Oct 10 18:05:37 2011
@@ -0,0 +1,2 @@
+[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+
+(\d+)

Propchange: subversion/tags/1.7.0/
--
bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID%

Propchange: subversion/tags/1.7.0/
--
--- svn:ignore (added)
+++ svn:ignore Mon Oct 10 18:05:37 2011
@@ -0,0 +1,50 @@
+ChangeLog*
+Makefile
+config.cache
+config.log
+config.nice
+config.status
+configure
+libtool
+.gdb_history
+.swig_checked
+*.orig
+*.rej
+TAGS
+tags
+neon
+build-outputs.mk
+autogen-standalone.mk
+autom4te.cache
+gen-make.opts
+tests.log*
+fails.log
+db4-win32
+db
+*.o
+*~
+.*~
+apr
+apr-util
+apr-iconv
+Release
+Debug
+ipch
+subversion_msvc.dsw
+subversion_msvc.ncb
+subversion_msvc.opt
+subversion_msvc.plg
+subversion_vcnet.sln
+subversion_vcnet.ncb
+subversion_vcnet.suo
+subversion_vcnet.sdf
+subversion_vcnet.opensdf
+mkmf.log
+.project
+.classpath
+.cdtproject
+.settings
+.cproject
+zlib
+sqlite-amalgamation
+serf

Propchange: subversion/tags/1.7.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 10 18:05:37 2011
@@ -0,0 +1,67 @@
+/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.7.x-JavaHL-pools:1158684-1158722
+/subversion/branches/1.7.x-issue3888:1148937-1149162
+/subversion/branches/1.7.x-issue3975:1160761-1161546
+/subversion/branches/1.7.x-issue3976:1161731-1165397
+/subversion/branches/1.7.x-issue4k:1166502-1167193
+/subversion/branches/1.7.x-neon-default:1148803-1158680
+/subversion/branches/1.7.x-r1152189:1152759-1154249
+/subversion/branches/1.7.x-r1155160:1158704-1159223
+/subversion/branches/1.7.x-r1159093:1159097-1159230
+/subversion/branches/1.7.x-r1163557:1163574-1170648
+/subversion/branches/1.7.x-r1173425:1173429-1176454
+/subversion/branches/atomic-revprop:965046-1000689
+/subversion/branches/bdb-reverse-deltas:872050-872529
+/subversion/branches/diff-callbacks3:870059-870761
+/subversion/branches/diff-optimizations:1031270-1037352
+/subversion/branches/diff-optimizations-bytes:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
+/subversion/branches/double-delete:870511-872970
+/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals:871779-873302
+/subversion/branches/fs-rep-sharing:869036-873803
+/subversion/branches/fsfs-pack:873717-874575
+/subversion/branches/gnome-keyring:870558-871410
+/subversion/branches/http-protocol-v2:874395-876041
+/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/integrate-cache-item-serialization:1068724-1068739
+/subversion/branches/integrate-cache-membuffer:998649-998852
+/subversion/branches/integrate-compression-level:1068651-1072287
+/subversion/branches/integrate-io-improvements:1068684-1072297
+/subversion/branches/integrate-is-cachable:1072568-1074082
+/subversion/branches/integrate-partial-getter:1072558-1076552
+/subversion/branches/integrate-readline-speedup:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions:1068695-1072516
+/subversion/branches/integrate-txdelta-caching:1072541-1078213
+/subversion/branches/issue-2779-dev:965496-984198
+/subversion/branches/issue-2843-dev:871432-874179
+/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees:873375-874084
+/subversion/branches/issue-3148-dev:875193-875204
+/subversion/branches/issue-3220-dev:872210-872226
+/subversion/branches/issue-3242-dev:879653-896436
+/subversion/branches/issue-3334-dirs:875156-875867
+/subversion/branches/issue-3975:1152931-1160746
+/subversion/branches/kwallet:870785-871314
+/subversion/branches/log-g-performance:870941-871032
+/subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/nfc-nfd-aware-client:870276,870376
+/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,98

svn commit: r1181100 - /subversion/branches/issue-3668-3669/BRANCH-README

[pburba]

Author: pburba
Date: Mon Oct 10 17:52:55 2011
New Revision: 1181100

URL: http://svn.apache.org/viewvc?rev=1181100&view=rev
Log:
On the issue-3668-3669 branch, add BRANCH-README.

Added:
subversion/branches/issue-3668-3669/BRANCH-README   (with props)

Added: subversion/branches/issue-3668-3669/BRANCH-README
URL: 
http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/BRANCH-README?rev=1181100&view=auto
==
--- subversion/branches/issue-3668-3669/BRANCH-README (added)
+++ subversion/branches/issue-3668-3669/BRANCH-README Mon Oct 10 17:52:55 2011
@@ -0,0 +1,2 @@
+This branch exists for reboot of issues #3668 and #3669, see
+http://subversion.tigris.org/issues/show_bug.cgi?id=4013#desc3

Propchange: subversion/branches/issue-3668-3669/BRANCH-README
--
svn:eol-style = native

svn commit: r1181093 - /subversion/branches/issue-3668-3669/

[pburba]

Author: pburba
Date: Mon Oct 10 17:44:24 2011
New Revision: 1181093

URL: http://svn.apache.org/viewvc?rev=1181093&view=rev
Log:
Create a branch for work on the reopened issues #3668 'inheritance can
result in self-referential mergeinfo' and issue #3669 'inheritance can
result in mergeinfo describing nonexistent sources'.

Added:
subversion/branches/issue-3668-3669/   (props changed)
  - copied from r1181092, subversion/trunk/

Propchange: subversion/branches/issue-3668-3669/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Oct 10 17:44:24 2011
@@ -0,0 +1,2 @@
+[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+
+(\d+)

Propchange: subversion/branches/issue-3668-3669/
--
bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID%

Propchange: subversion/branches/issue-3668-3669/
--
--- svn:ignore (added)
+++ svn:ignore Mon Oct 10 17:44:24 2011
@@ -0,0 +1,50 @@
+ChangeLog*
+Makefile
+config.cache
+config.log
+config.nice
+config.status
+configure
+libtool
+.gdb_history
+.swig_checked
+*.orig
+*.rej
+TAGS
+tags
+neon
+build-outputs.mk
+autogen-standalone.mk
+autom4te.cache
+gen-make.opts
+tests.log*
+fails.log*
+db4-win32
+db
+*.o
+*~
+.*~
+apr
+apr-util
+apr-iconv
+Release
+Debug
+ipch
+subversion_msvc.dsw
+subversion_msvc.ncb
+subversion_msvc.opt
+subversion_msvc.plg
+subversion_vcnet.sln
+subversion_vcnet.ncb
+subversion_vcnet.suo
+subversion_vcnet.sdf
+subversion_vcnet.opensdf
+mkmf.log
+.project
+.classpath
+.cdtproject
+.settings
+.cproject
+zlib
+sqlite-amalgamation
+serf

Propchange: subversion/branches/issue-3668-3669/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 10 17:44:24 2011
@@ -0,0 +1,57 @@
+/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.7.x-fs-verify:1146708,1161180
+/subversion/branches/atomic-revprop:965046-1000689
+/subversion/branches/bdb-reverse-deltas:872050-872529
+/subversion/branches/diff-callbacks3:870059-870761
+/subversion/branches/diff-optimizations:1031270-1037352
+/subversion/branches/diff-optimizations-bytes:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
+/subversion/branches/double-delete:870511-872970
+/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals:871779-873302
+/subversion/branches/fs-rep-sharing:869036-873803
+/subversion/branches/fsfs-pack:873717-874575
+/subversion/branches/gnome-keyring:870558-871410
+/subversion/branches/gpg-agent-password-store:1005036-1150766
+/subversion/branches/http-protocol-v2:874395-876041
+/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/integrate-cache-item-serialization:1068724-1068739
+/subversion/branches/integrate-cache-membuffer:998649-998852
+/subversion/branches/integrate-compression-level:1068651-1072287
+/subversion/branches/integrate-io-improvements:1068684-1072297
+/subversion/branches/integrate-is-cachable:1072568-1074082
+/subversion/branches/integrate-partial-getter:1072558-1076552
+/subversion/branches/integrate-readline-speedup:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions:1068695-1072516
+/subversion/branches/integrate-txdelta-caching:1072541-1078213
+/subversion/branches/issue-2779-dev:965496-984198
+/subversion/branches/issue-2843-dev:871432-874179
+/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees:873375-874084
+/subversion/branches/issue-3148-dev:875193-875204
+/subversion/branches/issue-3220-dev:872210-872226
+/subversion/branches/issue-3242-dev:879653-896436
+/subversion/branches/issue-3334-dirs:875156-875867
+/subversion/branches/issue-3975:1152931-1160746
+/subversion/branches/kwallet:870785-871314
+/subversion/branches/log-g-performance:870941-871032
+/subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/nfc-nfd-aware-client:870276,870376
+/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-

svn commit: r1181090 - in /subversion/trunk/subversion: include/svn_sorts.h libsvn_client/merge.c libsvn_subr/mergeinfo.c libsvn_subr/sorts.c

[pburba]

Author: pburba
Date: Mon Oct 10 17:40:57 2011
New Revision: 1181090

URL: http://svn.apache.org/viewvc?rev=1181090&view=rev
Log:
Follow-up to r1180154: svn_rangelist_merge2 optimization.

Suggested by: philip

* subversion/include/svn_sorts.h

  (svn_sort__array_delete): Add an argument specifying the number of elements
   to delete.

* subversion/libsvn_client/merge.c

  (remove_absent_children,
   remove_children_with_deleted_mergeinfo): Update calls to
   svn_sort__array_delete.

* subversion/libsvn_subr/mergeinfo.c

  (adjust_remaining_ranges): Make a single call to svn_sort__array_delete
   rather than iterating over each deleted element.

* subversion/libsvn_subr/sorts.c

  (svn_sort__array_delete): Add an argument specifying the number of elements
   to delete.

Modified:
subversion/trunk/subversion/include/svn_sorts.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_subr/mergeinfo.c
subversion/trunk/subversion/libsvn_subr/sorts.c

Modified: subversion/trunk/subversion/include/svn_sorts.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_sorts.h?rev=1181090&r1=1181089&r2=1181090&view=diff
==
--- subversion/trunk/subversion/include/svn_sorts.h (original)
+++ subversion/trunk/subversion/include/svn_sorts.h Mon Oct 10 17:40:57 2011
@@ -182,11 +182,15 @@ svn_sort__array_insert(const void *new_e
int insert_index);
 
 
-/* Remove the element at DELETE_INDEX from the array ARR.
-   If DELETE_INDEX is not a valid element of ARR do nothing. */
+/* Remove ELEMENTS_TO_DELETE elements starting  at DELETE_INDEX from the
+   array ARR. If DELETE_INDEX is not a valid element of ARR,
+   ELEMENTS_TO_DELETE is not greater than zero, or
+   DELETE_INDEX + ELEMENTS_TO_DELETE is grater than ARR->NELTS, then do
+   nothing. */
 void
 svn_sort__array_delete(apr_array_header_t *arr,
-   int delete_index);
+   int delete_index,
+   int elements_to_delete);
 
 #ifdef __cplusplus
 }

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1181090&r1=1181089&r2=1181090&view=diff
==
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Oct 10 17:40:57 2011
@@ -4795,7 +4795,7 @@ remove_absent_children(const char *targe
   if ((child->absent || child->scheduled_for_deletion)
   && svn_dirent_is_ancestor(target_wcpath, child->abspath))
 {
-  svn_sort__array_delete(children_with_mergeinfo, i--);
+  svn_sort__array_delete(children_with_mergeinfo, i--, 1);
 }
 }
 }
@@ -4831,7 +4831,7 @@ remove_children_with_deleted_mergeinfo(m
child->abspath,
APR_HASH_KEY_STRING))
 {
-  svn_sort__array_delete(notify_b->children_with_mergeinfo, i--);
+  svn_sort__array_delete(notify_b->children_with_mergeinfo, i--, 1);
 }
 }
 }

Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1181090&r1=1181089&r2=1181090&view=diff
==
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Mon Oct 10 17:40:57 2011
@@ -902,8 +902,7 @@ adjust_remaining_ranges(apr_array_header
 }
 
   if (elements_to_delete)
-for (i = starting_index; i < (elements_to_delete + starting_index); i++)
-  svn_sort__array_delete(rangelist, starting_index);
+svn_sort__array_delete(rangelist, starting_index, elements_to_delete);
 }
 
 svn_error_t *

Modified: subversion/trunk/subversion/libsvn_subr/sorts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sorts.c?rev=1181090&r1=1181089&r2=1181090&view=diff
==
--- subversion/trunk/subversion/libsvn_subr/sorts.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sorts.c Mon Oct 10 17:40:57 2011
@@ -248,21 +248,31 @@ svn_sort__array_insert(const void *new_e
 
 void
 svn_sort__array_delete(apr_array_header_t *arr,
-   int delete_index)
+   int delete_index,
+   int elements_to_delete)
 {
-  /* Do we have a valid index? */
-  if (delete_index >= 0 && delete_index < arr->nelts)
+  /* Do we have a valid index and are there enough elements? */
+  if (delete_index >= 0
+  && delete_index < arr->nelts
+  && elements_to_delete > 0
+  && (elements_to_delete + delete_index) <= arr->nelts)
 {
   if (delete_index == (arr->n

svn commit: r1181047 - /subversion/branches/tree-read-api/subversion/libsvn_client/diff.c

[julianfoad]

Author: julianfoad
Date: Mon Oct 10 16:01:01 2011
New Revision: 1181047

URL: http://svn.apache.org/viewvc?rev=1181047&view=rev
Log:
On the 'tree-read-api' branch: An initial implementation of a flexible diff
that compares two arbitrary trees.

* subversion/libsvn_client/diff.c
  (tree_get_tmp_file, compare_two_trees, open_tree): New functions.
  (do_diff): Use compare_two_trees() always (for demonstration purposes).

Modified:
subversion/branches/tree-read-api/subversion/libsvn_client/diff.c

Modified: subversion/branches/tree-read-api/subversion/libsvn_client/diff.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_client/diff.c?rev=1181047&r1=1181046&r2=1181047&view=diff
==
--- subversion/branches/tree-read-api/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/tree-read-api/subversion/libsvn_client/diff.c Mon Oct 
10 16:01:01 2011
@@ -50,6 +50,7 @@
 #include "svn_sorts.h"
 #include "svn_subst.h"
 #include "client.h"
+#include "tree.h"
 
 #include "private/svn_wc_private.h"
 
@@ -67,6 +68,239 @@ static const char under_string[] =
 
 /*-*/
 
+
+/* */
+static svn_error_t *
+tree_get_tmp_file(svn_client_tree_t *tree,
+  const char **tmpfile_abspath,
+  apr_hash_t **props,
+  const char *relpath,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool)
+{
+  svn_stream_t *s_in;
+  svn_stream_t *s_out;
+
+  SVN_ERR(svn_tree_get_file(tree, &s_in, props, relpath,
+scratch_pool, scratch_pool));
+  if (s_in == NULL)
+return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
+ _("no file at '%s'"), relpath);
+
+  SVN_ERR(svn_stream_open_unique(&s_out, tmpfile_abspath, NULL,
+ svn_io_file_del_on_pool_cleanup,
+ result_pool, scratch_pool));
+  SVN_ERR(svn_stream_copy3(s_in, s_out, NULL, NULL, scratch_pool));
+
+  return SVN_NO_ERROR;
+}
+
+/* Compare two (independent) trees */
+static svn_error_t *
+compare_two_trees(svn_client_tree_t *tree1,
+  const char *relpath1,
+  svn_client_tree_t *tree2,
+  const char *relpath2,
+  const svn_wc_diff_callbacks4_t *callbacks,
+  void *callback_baton,
+  apr_pool_t *scratch_pool)
+{
+  const char *empty_file = "/dev/null";
+  svn_kind_t kind1, kind2;
+
+  SVN_ERR(svn_tree_get_kind(tree1, &kind1, relpath1, scratch_pool));
+  SVN_ERR(svn_tree_get_kind(tree2, &kind2, relpath2, scratch_pool));
+
+  if (kind1 == kind2)
+{
+  switch (kind1)
+{
+case svn_kind_none:
+  return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+   _("No node at relative paths '%s' and 
'%s'"),
+   relpath1, relpath2);
+case svn_kind_file:
+{
+  const char *tmpfile1, *tmpfile2;
+  apr_hash_t *props1, *props2;
+  apr_array_header_t *propchanges;
+  svn_revnum_t rev = SVN_INVALID_REVNUM;
+
+  SVN_ERR(tree_get_tmp_file(tree1, &tmpfile1, &props1, relpath1,
+scratch_pool, scratch_pool));
+  SVN_ERR(tree_get_tmp_file(tree2, &tmpfile2, &props2, relpath2,
+scratch_pool, scratch_pool));
+  SVN_ERR(svn_prop_diffs(&propchanges, props1, props2, scratch_pool));
+
+  SVN_ERR(callbacks->file_opened(NULL, NULL,
+ relpath1, rev,
+ callback_baton, scratch_pool));
+  SVN_ERR(callbacks->file_changed(NULL, NULL, NULL,
+  relpath1, tmpfile1, tmpfile2,
+  rev, rev, NULL, NULL,
+  propchanges, props1,
+  callback_baton, scratch_pool));
+  break;
+}
+case svn_kind_dir:
+{
+  apr_hash_t *dirents1, *dirents2;
+  apr_hash_t *props1, *props2;
+  apr_array_header_t *propchanges;
+  svn_revnum_t rev = SVN_INVALID_REVNUM;
+  apr_hash_t *all_children;
+  apr_hash_index_t *hi;
+
+  /* Open dir and compare properties */
+  SVN_ERR(svn_tree_get_dir(tree1, &dirents1, &props1, relpath1,
+   scratch_pool, scratch_pool));
+  SVN_ERR(svn_tree_get_dir(tree2, &dirents2, &props2, relpath2,
+   scratch_pool, scratch_pool));
+  SVN_ERR(svn_prop_diffs(&propchanges, props1, props2, scratch_pool));
+  SVN_ERR(callbacks->dir_opened(NULL, NULL, NULL,
+relpa

svn commit: r1181044 - /subversion/branches/tree-read-api/subversion/libsvn_client/tree.c

[julianfoad]

Author: julianfoad
Date: Mon Oct 10 15:58:52 2011
New Revision: 1181044

URL: http://svn.apache.org/viewvc?rev=1181044&view=rev
Log:
On the 'tree-read-api' branch: Implement some more cases.

* subversion/libsvn_client/tree.c
  (wc_tree_get_kind): For the base kind, return the working kind instead of
an uninitialized value. That's still wrong, of course.
  (wc_tree_get_dir): Return the working children instead of an empty list.
That's still wrong for the base version.
  (wc_tree_get_symlink): Implement for the working version.
  (ra_tree_get_symlink): Implement.

Modified:
subversion/branches/tree-read-api/subversion/libsvn_client/tree.c

Modified: subversion/branches/tree-read-api/subversion/libsvn_client/tree.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_client/tree.c?rev=1181044&r1=1181043&r2=1181044&view=diff
==
--- subversion/branches/tree-read-api/subversion/libsvn_client/tree.c (original)
+++ subversion/branches/tree-read-api/subversion/libsvn_client/tree.c Mon Oct 
10 15:58:52 2011
@@ -24,6 +24,7 @@
 #include "svn_dirent_uri.h"
 #include "client.h"
 #include "tree.h"
+#include "private/svn_wc_private.h"
 
 
 /*-*/
@@ -255,10 +256,9 @@ wc_tree_get_kind(svn_client_tree_t *tree
 
   if (baton->is_base)
 {
-  /* ###
-   * SVN_ERR(svn_wc_read_base_kind(kind, baton->wc_ctx, abspath,
-   *   scratch_pool));
-   */
+  /* ### svn_wc_read_base_kind()? */
+  SVN_ERR(svn_wc_read_kind2(kind, baton->wc_ctx, abspath,
+FALSE /* show_hidden */, scratch_pool));
 }
   else
 SVN_ERR(svn_wc_read_kind2(kind, baton->wc_ctx, abspath,
@@ -316,7 +316,22 @@ wc_tree_get_dir(svn_client_tree_t *tree,
 
   if (dirents)
 {
-  *dirents = apr_hash_make(result_pool);  /* ### */
+  /* if (baton->is_base) { ### ... } else */
+
+  const apr_array_header_t *children;
+  int i;
+
+  *dirents = apr_hash_make(result_pool);
+  SVN_ERR(svn_wc__node_get_children_of_working_node(
+&children, baton->wc_ctx, abspath, FALSE /* show_hidden */,
+result_pool, scratch_pool));
+  for (i = 0; i < children->nelts; i++)
+{
+  const char *child_abspath = APR_ARRAY_IDX(children, i, const char *);
+  const char *name = svn_dirent_basename(child_abspath, scratch_pool);
+
+  apr_hash_set(*dirents, name, APR_HASH_KEY_STRING, (void *)1);
+}
 }
   if (props)
 {
@@ -346,7 +361,14 @@ wc_tree_get_symlink(svn_client_tree_t *t
 
   if (link_target)
 {
-  *link_target = "";  /* ### */
+  if (baton->is_base)
+*link_target = "";  /* ### */
+  else
+{
+  svn_string_t *dest;
+  SVN_ERR(svn_io_read_link(&dest, abspath, result_pool));
+  *link_target = dest->data;
+}
 }
   if (props)
 {
@@ -509,8 +531,8 @@ ra_tree_get_symlink(svn_client_tree_t *t
 {
   ra_tree_baton_t *baton = tree->priv;
 
-  /* ### ... */
-
+  SVN_ERR(svn_ra_get_symlink(baton->ra_session, relpath, baton->revnum,
+ link_target, NULL, props, result_pool));
   return SVN_NO_ERROR;
 }
 

svn commit: r1181040 - in /subversion/branches/tree-read-api/subversion: include/svn_ra.h libsvn_ra/ra_loader.c

[julianfoad]

Author: julianfoad
Date: Mon Oct 10 15:52:23 2011
New Revision: 1181040

URL: http://svn.apache.org/viewvc?rev=1181040&view=rev
Log:
On the 'tree-read-api' branch: Implement svn_ra_get_symlink() and make
svn_ra_check_path2() support symlinks.

* subversion/include/svn_ra.h
  (svn_ra_get_symlink): New function.

* subversion/libsvn_ra/ra_loader.c
  (svn_ra_get_symlink): New function.
  (svn_ra_check_path2): Use svn_ra_get_symlink() to detect symlinks.

Modified:
subversion/branches/tree-read-api/subversion/include/svn_ra.h
subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c

Modified: subversion/branches/tree-read-api/subversion/include/svn_ra.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/include/svn_ra.h?rev=1181040&r1=1181039&r2=1181040&view=diff
==
--- subversion/branches/tree-read-api/subversion/include/svn_ra.h (original)
+++ subversion/branches/tree-read-api/subversion/include/svn_ra.h Mon Oct 10 
15:52:23 2011
@@ -990,6 +990,27 @@ svn_ra_get_dir2(svn_ra_session_t *sessio
 apr_pool_t *pool);
 
 /**
+ * If @a link_target is non @c NULL, set @a *link_target to the target of
+ * the symbolic link at @a path at @a revision.
+ *
+ * If @a props is non @c NULL, set @a *props to contain the properties of
+ * the link.  This means @em all properties: not just ones controlled by
+ * the user and stored in the repository fs, but non-tweakable ones
+ * generated by the SCM system itself (e.g. 'wcprops', 'entryprops',
+ * etc.)  The keys are const char *, values are
+ * @c svn_string_t *.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *svn_ra_get_symlink(svn_ra_session_t *session,
+const char *path,
+svn_revnum_t revision,
+const char **link_target,
+svn_revnum_t *fetched_rev,
+apr_hash_t **props,
+apr_pool_t *pool);
+
+/**
  * Similar to @c svn_ra_get_dir2, but with @c SVN_DIRENT_ALL for the
  * @a dirent_fields parameter.
  *

Modified: subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c?rev=1181040&r1=1181039&r2=1181040&view=diff
==
--- subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c 
(original)
+++ subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c Mon Oct 
10 15:52:23 2011
@@ -44,6 +44,7 @@
 #include "svn_path.h"
 #include "svn_dso.h"
 #include "svn_config.h"
+#include "svn_props.h"
 #include "ra_loader.h"
 
 #include "private/svn_ra_private.h"
@@ -757,6 +758,39 @@ svn_error_t *svn_ra_get_dir2(svn_ra_sess
   path, revision, dirent_fields, pool);
 }
 
+#define SVN_SUBST__SPECIAL_LINK_STR "link"
+
+svn_error_t *svn_ra_get_symlink(svn_ra_session_t *session,
+const char *path,
+svn_revnum_t revision,
+const char **link_target,
+svn_revnum_t *fetched_rev,
+apr_hash_t **props_p,
+apr_pool_t *pool)
+{
+  svn_stringbuf_t *str = svn_stringbuf_create("", pool);
+  svn_stream_t *stream = svn_stream_from_stringbuf(str, pool);
+  apr_hash_t *props;
+  svn_string_t *special;
+
+  SVN_ERR_ASSERT(*path != '/');
+  SVN_ERR(svn_ra_get_file(session, path, revision,
+  stream, fetched_rev, &props, pool));
+  special = apr_hash_get(props, SVN_PROP_SPECIAL, APR_HASH_KEY_STRING);
+  if (special == NULL
+  || strncmp(special->data, SVN_SUBST__SPECIAL_LINK_STR " ",
+ strlen(SVN_SUBST__SPECIAL_LINK_STR " ")) != 0)
+return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
+ _("not a symlink: '%s' at r%ld"), path, revision);
+
+  if (link_target)
+*link_target = apr_pstrdup(pool, special->data +
+ strlen(SVN_SUBST__SPECIAL_LINK_STR " "));
+  if (props_p)
+*props_p = props;
+  return SVN_NO_ERROR;
+}
+
 svn_error_t *svn_ra_get_mergeinfo(svn_ra_session_t *session,
   svn_mergeinfo_catalog_t *catalog,
   const apr_array_header_t *paths,
@@ -916,11 +950,23 @@ svn_ra_check_path2(svn_ra_session_t *ses
   switch (node_kind)
 {
 case svn_node_file:
-  if (FALSE /* ### special */)
-*kind = svn_kind_symlink;
+{
+  const char *target;
+  svn_error_t *err;
+
+  err = svn_ra_get_symlink(session, path, revision, &target, NULL, NULL,
+   scratch_pool);
+  if (err && err->apr_err == SVN_ERR_NODE_UNEXPECTED_KIND)
+{

svn propchange: r1180771 - svn:log

[rhuijben]

Author: rhuijben
Revision: 1180771
Modified property: svn:log

Modified: svn:log at Mon Oct 10 15:46:16 2011
--
--- svn:log (original)
+++ svn:log Mon Oct 10 15:46:16 2011
@@ -2,7 +2,7 @@ Fix 12 license header issues.
 
 * tools/dist/rat-excludes: Add four entries (one wildcard).
 
-* tools/client-side/mergeinfo-sanitizer.py,
+* tools/client-side/mergeinfo-sanitizer.py
 * tools/dev/benchmarks/suite1/cronjob: Add license header.
 
-Approved by: Bert Huijben
+Approved by: rhuijben

svn commit: r1180936 - in /subversion/branches/tree-read-api/subversion/libsvn_client: tree.c tree.h

[julianfoad]

Author: julianfoad
Date: Mon Oct 10 13:08:39 2011
New Revision: 1180936

URL: http://svn.apache.org/viewvc?rev=1180936&view=rev
Log:
On the 'tree-read-api' branch: Tweak the tree API, and implement the WC-base
and WC-working implementations of it (incompletely).

* subversion/libsvn_client/tree.h
  (svn_client__disk_tree): Remove the unused 'editor' parameter.
  (svn_client__wc_base_tree, svn_client__wc_working_tree): Remove the
unused 'editor' parameter, require an abspath, add a client context
parameter.

* subversion/libsvn_client/tree.c
  (disk_tree_get_file, disk_tree_get_dir, disk_tree_get_symlink): Create an
empty hash if props are requested, as NULL is not allowed.
  (wc_tree_baton_t, wc_tree_vtable): New structs.
  (wc_tree_get_kind, wc_tree_get_file, wc_tree_get_dir, wc_tree_get_symlink):
New functions.
  (svn_client__wc_base_tree, svn_client__wc_working_tree): Implement.
  (read_ra_tree, svn_client__repository_tree): Remove an unused parameter.

Modified:
subversion/branches/tree-read-api/subversion/libsvn_client/tree.c
subversion/branches/tree-read-api/subversion/libsvn_client/tree.h

Modified: subversion/branches/tree-read-api/subversion/libsvn_client/tree.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_client/tree.c?rev=1180936&r1=1180935&r2=1180936&view=diff
==
--- subversion/branches/tree-read-api/subversion/libsvn_client/tree.c (original)
+++ subversion/branches/tree-read-api/subversion/libsvn_client/tree.c Mon Oct 
10 13:08:39 2011
@@ -150,7 +150,7 @@ disk_tree_get_file(svn_client_tree_t *tr
 SVN_ERR(svn_stream_open_readonly(stream, abspath,
  result_pool, scratch_pool));
   if (props)
-*props = NULL;
+*props = apr_hash_make(result_pool);
 
   return SVN_NO_ERROR;
 }
@@ -174,7 +174,7 @@ disk_tree_get_dir(svn_client_tree_t *tre
   result_pool, scratch_pool));
 }
   if (props)
-*props = NULL;
+*props = apr_hash_make(result_pool);
 
   return SVN_NO_ERROR;
 }
@@ -199,7 +199,7 @@ disk_tree_get_symlink(svn_client_tree_t 
   *link_target = dest->data;
 }
   if (props)
-*props = NULL;
+*props = apr_hash_make(result_pool);
 
   return SVN_NO_ERROR;
 }
@@ -216,7 +216,6 @@ static const svn_client_tree__vtable_t d
 svn_error_t *
 svn_client__disk_tree(svn_client_tree_t **tree_p,
   const char *abspath,
-  svn_delta_editor_t *editor,
   apr_pool_t *result_pool)
 {
   svn_client_tree_t *tree = apr_palloc(result_pool, sizeof(*tree));
@@ -235,13 +234,158 @@ svn_client__disk_tree(svn_client_tree_t 
 /*-*/
 
 
+/* */
+typedef struct wc_tree_baton_t
+{
+  const char *tree_abspath;
+  svn_wc_context_t *wc_ctx;
+  svn_boolean_t is_base;  /* true -> base, false -> working */
+} wc_tree_baton_t;
+
+/* */
+static svn_error_t *
+wc_tree_get_kind(svn_client_tree_t *tree,
+ svn_kind_t *kind,
+ const char *relpath,
+ apr_pool_t *scratch_pool)
+{
+  wc_tree_baton_t *baton = tree->priv;
+  const char *abspath = svn_dirent_join(baton->tree_abspath, relpath,
+scratch_pool);
+
+  if (baton->is_base)
+{
+  /* ###
+   * SVN_ERR(svn_wc_read_base_kind(kind, baton->wc_ctx, abspath,
+   *   scratch_pool));
+   */
+}
+  else
+SVN_ERR(svn_wc_read_kind2(kind, baton->wc_ctx, abspath,
+  FALSE /* show_hidden */, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* */
+static svn_error_t *
+wc_tree_get_file(svn_client_tree_t *tree,
+ svn_stream_t **stream,
+ apr_hash_t **props,
+ const char *relpath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+  wc_tree_baton_t *baton = tree->priv;
+  const char *abspath = svn_dirent_join(baton->tree_abspath, relpath,
+scratch_pool);
+
+  if (stream)
+{
+  if (baton->is_base)
+SVN_ERR(svn_wc_get_pristine_contents2(stream, baton->wc_ctx, abspath,
+  result_pool, scratch_pool));
+  else
+SVN_ERR(svn_stream_open_readonly(stream, abspath,
+ result_pool, scratch_pool));
+}
+  if (props)
+{
+  if (baton->is_base)
+SVN_ERR(svn_wc_get_pristine_props(props, baton->wc_ctx, abspath,
+  result_pool, scratch_pool));
+  else
+SVN_ERR(svn_wc_prop_list2(props, baton->wc_ctx, abspath,
+  result_pool, scratch_pool));
+}
+
+  return SVN_NO_ERROR;
+}
+
+/* */
+static svn_error_t *
+wc_tree_get_dir(svn_client_tree_t *tree,
+   

svn commit: r1180932 - in /subversion/branches/tree-read-api/subversion: include/svn_wc.h libsvn_wc/node.c

[julianfoad]

Author: julianfoad
Date: Mon Oct 10 13:01:39 2011
New Revision: 1180932

URL: http://svn.apache.org/viewvc?rev=1180932&view=rev
Log:
On the 'tree-read-api' branch: Implement an svn_kind_t (symlink-supporting)
version of svn_wc_read_kind().

* subversion/include/svn_wc.h
  (svn_wc_read_kind2): New, revved version of svn_wc_read_kind().

* subversion/libsvn_wc/node.c
  (convert_db_kind_to_node_kind2): New function.
  (svn_wc_read_kind2): New, revved version of svn_wc_read_kind().

Modified:
subversion/branches/tree-read-api/subversion/include/svn_wc.h
subversion/branches/tree-read-api/subversion/libsvn_wc/node.c

Modified: subversion/branches/tree-read-api/subversion/include/svn_wc.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/include/svn_wc.h?rev=1180932&r1=1180931&r2=1180932&view=diff
==
--- subversion/branches/tree-read-api/subversion/include/svn_wc.h (original)
+++ subversion/branches/tree-read-api/subversion/include/svn_wc.h Mon Oct 10 
13:01:39 2011
@@ -7857,7 +7857,7 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
 /** @} */
 
 /**
- * Set @a kind to the #svn_node_kind_t of @a abspath.  Use @a wc_ctx
+ * Set @a kind to the node kind of @a abspath.  Use @a wc_ctx
  * to access the working copy, and @a scratch_pool for all temporary
  * allocations.
  *
@@ -7869,9 +7869,19 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
  * ### What happens when show_hidden is TRUE?
  *
  * If the node's info is incomplete, it may or may not have a known node kind
- * set. If the kind is not known (yet), set @a kind to #svn_node_unknown.
+ * set. If the kind is not known (yet), set @a kind to #svn_kind_unknown.
  * Otherwise return the node kind even though the node is marked incomplete.
  *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_wc_read_kind2(svn_kind_t *kind,
+  svn_wc_context_t *wc_ctx,
+  const char *abspath,
+  svn_boolean_t show_hidden,
+  apr_pool_t *scratch_pool);
+
+/* @deprecated
  * @since New in 1.7.
  */
 svn_error_t *

Modified: subversion/branches/tree-read-api/subversion/libsvn_wc/node.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_wc/node.c?rev=1180932&r1=1180931&r2=1180932&view=diff
==
--- subversion/branches/tree-read-api/subversion/libsvn_wc/node.c (original)
+++ subversion/branches/tree-read-api/subversion/libsvn_wc/node.c Mon Oct 10 
13:01:39 2011
@@ -279,6 +279,78 @@ convert_db_kind_to_node_kind(svn_node_ki
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+convert_db_kind_to_node_kind2(svn_kind_t *kind,
+  svn_wc__db_kind_t db_kind,
+  svn_wc__db_status_t db_status,
+  svn_boolean_t show_hidden)
+{
+  switch (db_kind)
+{
+  case svn_wc__db_kind_file:
+*kind = svn_kind_file;
+break;
+  case svn_wc__db_kind_dir:
+*kind = svn_kind_dir;
+break;
+  case svn_wc__db_kind_symlink:
+*kind = svn_kind_symlink;
+break;
+  case svn_wc__db_kind_unknown:
+*kind = svn_kind_unknown;
+break;
+  default:
+SVN_ERR_MALFUNCTION();
+}
+
+  /* Make sure hidden nodes return svn_node_none. */
+  if (! show_hidden)
+switch (db_status)
+  {
+case svn_wc__db_status_not_present:
+case svn_wc__db_status_server_excluded:
+case svn_wc__db_status_excluded:
+  *kind = svn_kind_none;
+
+default:
+  break;
+  }
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_wc_read_kind2(svn_kind_t *kind,
+  svn_wc_context_t *wc_ctx,
+  const char *local_abspath,
+  svn_boolean_t show_hidden,
+  apr_pool_t *scratch_pool)
+{
+  svn_wc__db_status_t db_status;
+  svn_wc__db_kind_t db_kind;
+  svn_error_t *err;
+
+  err = svn_wc__db_read_info(&db_status, &db_kind, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ wc_ctx->db, local_abspath,
+ scratch_pool, scratch_pool);
+
+  if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
+{
+  svn_error_clear(err);
+  *kind = svn_node_none;
+  return SVN_NO_ERROR;
+}
+  else
+SVN_ERR(err);
+
+  SVN_ERR(convert_db_kind_to_node_kind2(kind, db_kind, db_status, 
show_hidden));
+
+  return SVN_NO_ERROR;
+}
+
 svn_error_t *
 svn_wc_read_kind(svn_node_kind_t *kind,
  svn_wc_context_t *wc_ctx,

Re: svn commit: r1180771 - in /subversion/trunk/tools: client-side/mergeinfo-sanitizer.py dev/benchmarks/suite1/cronjob dist/rat-excludes

[Neels J Hofmeyr]

I took the liberty to tweak the log message -- I hope that's ok with you, Gavin!

~Neels

On 10/10/2011 05:14 AM, gmcdon...@apache.org wrote:
> Author: gmcdonald
> Date: Mon Oct 10 03:14:49 2011
> New Revision: 1180771
> 
> URL: http://svn.apache.org/viewvc?rev=1180771&view=rev
> Log:
> Below changes fix 12 license header issues:
> 
> * tools/dist/rat-excludes
> 
>   Entries added:
> 
>   subversion/tests/cmdline/diff_tests_data/
>   tools/dev/benchmarks/suite1/crontab.entry
>   tools/dist/_gnupg.py
>   tools/dist/templates/*.ezt
> 
> * tools/client-side/mergeinfo-sanitizer.py
> * tools/dev/benchmarks/suite1/cronjob
> 
>   These have license headers added
> 
> Approved by: Bert Huijben
> 
> 
> Modified:
> subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
> subversion/trunk/tools/dev/benchmarks/suite1/cronjob
> subversion/trunk/tools/dist/rat-excludes
> 
> Modified: subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
> URL: 
> http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/mergeinfo-sanitizer.py?rev=1180771&r1=1180770&r2=1180771&view=diff
> ==
> --- subversion/trunk/tools/client-side/mergeinfo-sanitizer.py (original)
> +++ subversion/trunk/tools/client-side/mergeinfo-sanitizer.py Mon Oct 10 
> 03:14:49 2011
> @@ -1,4 +1,23 @@
>  #!/usr/bin/env python
> +#
> +# 
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# with the License.  You may obtain a copy of the License at
> +#
> +#   http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing,
> +# software distributed under the License is distributed on an
> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +# KIND, either express or implied.  See the License for the
> +# specific language governing permissions and limitations
> +# under the License.
> +# 
>  import svn
>  import sys
>  import os
> 
> Modified: subversion/trunk/tools/dev/benchmarks/suite1/cronjob
> URL: 
> http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/suite1/cronjob?rev=1180771&r1=1180770&r2=1180771&view=diff
> ==
> --- subversion/trunk/tools/dev/benchmarks/suite1/cronjob (original)
> +++ subversion/trunk/tools/dev/benchmarks/suite1/cronjob Mon Oct 10 03:14:49 
> 2011
> @@ -1,4 +1,24 @@
>  #!/bin/bash
> +#
> +# 
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# with the License.  You may obtain a copy of the License at
> +#
> +#   http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing,
> +# software distributed under the License is distributed on an
> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +# KIND, either express or implied.  See the License for the
> +# specific language governing permissions and limitations
> +# under the License.
> +# 
> +#
>  # This is the cronjob as run on our ASF box aka svn-qavm.
>  # It uses neels' mad bash script magic called 'pat' to update and
>  # build the latest trunk, invokes a benchmark and sends as mail.
> 
> Modified: subversion/trunk/tools/dist/rat-excludes
> URL: 
> http://svn.apache.org/viewvc/subversion/trunk/tools/dist/rat-excludes?rev=1180771&r1=1180770&r2=1180771&view=diff
> ==
> --- subversion/trunk/tools/dist/rat-excludes (original)
> +++ subversion/trunk/tools/dist/rat-excludes Mon Oct 10 03:14:49 2011
> @@ -15,6 +15,7 @@ doc/doxygen.conf
>  notes/**
>  packages/
>  subversion/tests/cmdline/getopt_tests_data/*
> +subversion/tests/cmdline/diff_tests_data/*
>  subversion/bindings/swig/NOTES
>  subversion/libsvn_fs_base/notes/TODO
>  subversion/libsvn_fs_base/notes/fs-history
> @@ -31,8 +32,11 @@ subversion/bindings/ctypes-python/csvn/e
>  subversion/tests/cmdline/svntest/err.py
>  tools/buildbot/master/public_html/buildbot.css
>  tools/dist/rat-excludes
> +tools/dist/_gnupg.py
> +tools/dist/templates/*.ezt
>  tools/dev/iz

svn propchange: r1180771 - svn:log

[neels]

Author: neels
Revision: 1180771
Modified property: svn:log

Modified: svn:log at Mon Oct 10 12:20:44 2011
--
--- svn:log (original)
+++ svn:log Mon Oct 10 12:20:44 2011
@@ -1,18 +1,8 @@
-Below changes fix 12 license header issues:
+Fix 12 license header issues.
 
-* tools/dist/rat-excludes
+* tools/dist/rat-excludes: Add four entries (one wildcard).
 
-  Entries added:
-
-  subversion/tests/cmdline/diff_tests_data/
-  tools/dev/benchmarks/suite1/crontab.entry
-  tools/dist/_gnupg.py
-  tools/dist/templates/*.ezt
-
-* tools/client-side/mergeinfo-sanitizer.py
-* tools/dev/benchmarks/suite1/cronjob
-
-  These have license headers added
+* tools/client-side/mergeinfo-sanitizer.py,
+* tools/dev/benchmarks/suite1/cronjob: Add license header.
 
 Approved by: Bert Huijben
-

svn commit: r1180868 - /subversion/trunk/subversion/libsvn_subr/mergeinfo.c

[philip]

Author: philip
Date: Mon Oct 10 10:40:46 2011
New Revision: 1180868

URL: http://svn.apache.org/viewvc?rev=1180868&view=rev
Log:
* subversion/libsvn_subr/mergeinfo.c
  (adjust_remaining_ranges): Rename index parameter to avoid shadowing
   the standard C function.

Modified:
subversion/trunk/subversion/libsvn_subr/mergeinfo.c

Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1180868&r1=1180867&r2=1180868&view=diff
==
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Mon Oct 10 10:40:46 2011
@@ -745,17 +745,17 @@ svn_mergeinfo_parse(svn_mergeinfo_t *mer
 /* Cleanup after svn_rangelist_merge2 when it modifies the ending range of
a single rangelist element in-place.
 
-   If *INDEX is not a valid element in RANGELIST do nothing.  Otherwise ensure
-   that RANGELIST[*INDEX]->END does not adjoin or overlap any subsequent
-   ranges in RANGELIST.
+   If *RANGE_INDEX is not a valid element in RANGELIST do nothing.  Otherwise
+   ensure that RANGELIST[*RANGE_INDEX]->END does not adjoin or overlap any
+   subsequent ranges in RANGELIST.
 
If overlap is found, then remove, modify, and/or add elements to RANGELIST
as per the invariants for rangelists documented in svn_mergeinfo.h.  If
-   RANGELIST[*INDEX]->END adjoins a subsequent element then combine the
+   RANGELIST[*RANGE_INDEX]->END adjoins a subsequent element then combine the
elements if their inheritability permits -- The inheritance of intersecting
and adjoining ranges is handled as per svn_mergeinfo_merge2.  Upon return
-   set *INDEX to the index of the youngest element modified, added, or
-   adjoined to RANGELIST[*INDEX].
+   set *RANGE_INDEX to the index of the youngest element modified, added, or
+   adjoined to RANGELIST[*RANGE_INDEX].
 
Note: Adjoining rangelist elements are those where the end rev of the older
element is equal to the start rev of the younger element.
@@ -763,7 +763,7 @@ svn_mergeinfo_parse(svn_mergeinfo_t *mer
Any new elements inserted into RANGELIST are allocated in  RESULT_POOL.*/
 static void
 adjust_remaining_ranges(apr_array_header_t *rangelist,
-int *index,
+int *range_index,
 apr_pool_t *result_pool)
 {
   int i;
@@ -771,13 +771,13 @@ adjust_remaining_ranges(apr_array_header
   int elements_to_delete = 0;
   svn_merge_range_t *modified_range;
 
-  if (*index >= rangelist->nelts)
+  if (*range_index >= rangelist->nelts)
 return;
 
-  starting_index = *index + 1;
-  modified_range = APR_ARRAY_IDX(rangelist, *index, svn_merge_range_t *);
+  starting_index = *range_index + 1;
+  modified_range = APR_ARRAY_IDX(rangelist, *range_index, svn_merge_range_t *);
 
-  for (i = *index + 1; i < rangelist->nelts; i++)
+  for (i = *range_index + 1; i < rangelist->nelts; i++)
 {
   svn_merge_range_t *next_range = APR_ARRAY_IDX(rangelist, i,
 svn_merge_range_t *);
@@ -799,7 +799,7 @@ adjust_remaining_ranges(apr_array_header
   else
 {
   /* Cannot join because inheritance differs. */
-  (*index)++;
+  (*range_index)++;
 }
   break;
 }
@@ -845,10 +845,11 @@ adjust_remaining_ranges(apr_array_header
   new_modified_range->end = modified_range->end;
   new_modified_range->inheritable = FALSE;
   modified_range->end = next_range->start;
-  (*index)+=2;
-  svn_sort__array_insert(&new_modified_range, rangelist, *index);
+  (*range_index)+=2;
+  svn_sort__array_insert(&new_modified_range, rangelist,
+ *range_index);
   /* Recurse with the new range. */
-  adjust_remaining_ranges(rangelist, index, result_pool);
+  adjust_remaining_ranges(rangelist, range_index, result_pool);
   break;
 }
 }
@@ -867,7 +868,7 @@ adjust_remaining_ranges(apr_array_header
   /* The intersection between MODIFIED_RANGE and NEXT_RANGE is
  absorbed by the latter. */
   modified_range->end = next_range->start;
-  (*index)++;
+  (*range_index)++;
 }
   break;
 }
@@ -887,14 +888,14 @@ adjust_remaining_ranges(apr_array_header
   /* MODIFIED_RANGE absorbs the portion of NEXT_RANGE it overlaps
  and NEXT_RANGE is truncated. */
   next_range->start = modified_range->end;
-  (*index)++;
+  (*range_index)++;
 }
   else
 {
   /* NEXT_RANGE absorbs the portion of MODIFIED_RANGE it overlaps
 

svn commit: r1180843 - in /subversion/branches/tree-read-api/subversion/libsvn_client: tree.c tree.h

[julianfoad]

Author: julianfoad
Date: Mon Oct 10 09:38:23 2011
New Revision: 1180843

URL: http://svn.apache.org/viewvc?rev=1180843&view=rev
Log:
On the 'tree-read-api' branch: Make the 'svn_client_tree_t' API a
hidden-vtable style with public functions, and make symlinks a first-class
object in the API. Remove the ill-conceived 'push_to_delta_editor' method.
Update to use the newly introduced 'svn_kind_t' which supports symlinks
instead of 'svn_node_kind_t'.

* subversion/libsvn_client/tree.h
  (svn_client_tree__vtable_t): Move the structure definition to 'tree.c',
leaving only the typedef here.
  (svn_tree_get_kind, svn_tree_get_file, svn_tree_get_dir,
   svn_tree_get_symlink): New functions.

* subversion/libsvn_client/tree.c
  (svn_client_tree__vtable_t): Move from 'tree.h'; add symlink handling;
remove push_to_delta_editor.
  (svn_tree_get_kind, svn_tree_get_file, svn_tree_get_dir,
   svn_tree_get_symlink): New functions.
  (disk_tree_get_kind, ra_tree_get_kind): Update to use 'svn_kind_t'.
  (disk_tree_get_symlink, ra_tree_get_symlink): New functions, the latter
not implemented.
  (disk_tree_vtable, ra_tree_vtable): Update.

Modified:
subversion/branches/tree-read-api/subversion/libsvn_client/tree.c
subversion/branches/tree-read-api/subversion/libsvn_client/tree.h

Modified: subversion/branches/tree-read-api/subversion/libsvn_client/tree.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_client/tree.c?rev=1180843&r1=1180842&r2=1180843&view=diff
==
--- subversion/branches/tree-read-api/subversion/libsvn_client/tree.c (original)
+++ subversion/branches/tree-read-api/subversion/libsvn_client/tree.c Mon Oct 
10 09:38:23 2011
@@ -29,6 +29,89 @@
 /*-*/
 
 
+/* V-table for #svn_client_tree_t. */
+struct svn_client_tree__vtable_t
+{
+  /* See svn_tree_get_kind(). */
+  svn_error_t *(*get_kind)(svn_client_tree_t *tree,
+   svn_kind_t *kind,
+   const char *relpath,
+   apr_pool_t *scratch_pool);
+
+  /* See svn_tree_get_file(). */
+  svn_error_t *(*get_file)(svn_client_tree_t *tree,
+   svn_stream_t **stream,
+   apr_hash_t **props,
+   const char *relpath,
+   apr_pool_t *result_pool,
+   apr_pool_t *scratch_pool);
+
+  /* See svn_tree_get_dir(). */
+  svn_error_t *(*get_dir)(svn_client_tree_t *tree,
+  apr_hash_t **dirents,
+  apr_hash_t **props,
+  const char *relpath,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool);
+
+  /* See svn_tree_get_symlink(). */
+  svn_error_t *(*get_symlink)(svn_client_tree_t *tree,
+  const char **link_target,
+  apr_hash_t **props,
+  const char *relpath,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool);
+};
+
+svn_error_t *
+svn_tree_get_kind(svn_client_tree_t *tree,
+  svn_kind_t *kind,
+  const char *relpath,
+  apr_pool_t *scratch_pool)
+{
+  return tree->vtable->get_kind(tree, kind, relpath, scratch_pool);
+}
+
+svn_error_t *
+svn_tree_get_file(svn_client_tree_t *tree,
+  svn_stream_t **stream,
+  apr_hash_t **props,
+  const char *relpath,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool)
+{
+  return tree->vtable->get_file(tree, stream, props, relpath,
+result_pool, scratch_pool);
+}
+
+svn_error_t *
+svn_tree_get_dir(svn_client_tree_t *tree,
+ apr_hash_t **dirents,
+ apr_hash_t **props,
+ const char *relpath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+  return tree->vtable->get_dir(tree, dirents, props, relpath,
+   result_pool, scratch_pool);
+}
+
+svn_error_t *
+svn_tree_get_symlink(svn_client_tree_t *tree,
+ const char **link_target,
+ apr_hash_t **props,
+ const char *relpath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+  return tree->vtable->get_symlink(tree, link_target, props, relpath,
+   result_pool, scratch_pool);
+}
+
+
+/*-*/
+
+
 /* */
 typedef struct disk_tree_baton_t
 {
@@ -38,7 +121,7 @@ typedef struct disk_tree_baton_t
 /* */
 static svn_error_t *
 disk_tree_get_kind(svn_client_tree_t *tree,
-   svn_n

svn commit: r1180839 - in /subversion/branches/tree-read-api/subversion: include/svn_io.h include/svn_ra.h include/svn_types.h libsvn_ra/ra_loader.c libsvn_subr/io.c

[julianfoad]

Author: julianfoad
Date: Mon Oct 10 09:26:07 2011
New Revision: 1180839

URL: http://svn.apache.org/viewvc?rev=1180839&view=rev
Log:
On the 'tree-read-api' branch: Add a 'svn_kind_t' that supports symlink,
and rev two functions to make use of it.

* subversion/include/svn_types.h
  (svn_kind_t): New type.

* subversion/include/svn_io.h
  (svn_io_check_path2): New function.

* subversion/include/svn_ra.h,
  subversion/libsvn_ra/ra_loader.c
  (svn_ra_check_path2): New function (not implemented properly).

* subversion/libsvn_subr/io.c
  (map_apr_finfo_to_kind, io_check_path2, svn_io_check_path2): New functions.

Modified:
subversion/branches/tree-read-api/subversion/include/svn_io.h
subversion/branches/tree-read-api/subversion/include/svn_ra.h
subversion/branches/tree-read-api/subversion/include/svn_types.h
subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c
subversion/branches/tree-read-api/subversion/libsvn_subr/io.c

Modified: subversion/branches/tree-read-api/subversion/include/svn_io.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/include/svn_io.h?rev=1180839&r1=1180838&r2=1180839&view=diff
==
--- subversion/branches/tree-read-api/subversion/include/svn_io.h (original)
+++ subversion/branches/tree-read-api/subversion/include/svn_io.h Mon Oct 10 
09:26:07 2011
@@ -155,6 +155,12 @@ svn_io_check_path(const char *path,
   svn_node_kind_t *kind,
   apr_pool_t *pool);
 
+/* */
+svn_error_t *
+svn_io_check_path2(const char *path,
+   svn_kind_t *kind,
+   apr_pool_t *pool);
+
 /**
  * Like svn_io_check_path(), but also set *is_special to @c TRUE if
  * the path is not a normal file.

Modified: subversion/branches/tree-read-api/subversion/include/svn_ra.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/include/svn_ra.h?rev=1180839&r1=1180838&r2=1180839&view=diff
==
--- subversion/branches/tree-read-api/subversion/include/svn_ra.h (original)
+++ subversion/branches/tree-read-api/subversion/include/svn_ra.h Mon Oct 10 
09:26:07 2011
@@ -1481,6 +1481,15 @@ svn_ra_get_log(svn_ra_session_t *session
void *receiver_baton,
apr_pool_t *pool);
 
+/* Like svn_ra_check_path() but returning svn_kind_t (includes symlink kind).
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_ra_check_path2(svn_ra_session_t *session,
+   const char *path,
+   svn_revnum_t revision,
+   svn_kind_t *kind,
+   apr_pool_t *scratch_pool);
 /**
  * Set @a *kind to the node kind associated with @a path at @a revision.
  * If @a path does not exist under @a revision, set @a *kind to

Modified: subversion/branches/tree-read-api/subversion/include/svn_types.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/include/svn_types.h?rev=1180839&r1=1180838&r2=1180839&view=diff
==
--- subversion/branches/tree-read-api/subversion/include/svn_types.h (original)
+++ subversion/branches/tree-read-api/subversion/include/svn_types.h Mon Oct 10 
09:26:07 2011
@@ -204,6 +204,28 @@ typedef enum svn_node_kind_t
   svn_node_unknown
 } svn_node_kind_t;
 
+/* A node kind.
+ *
+ * @since New in 1.8. Replaces svn_node_kind_t.
+ */
+typedef enum svn_kind_t
+{
+  /** absent */
+  svn_kind_none,
+
+  /** regular file */
+  svn_kind_file,
+
+  /** directory */
+  svn_kind_dir,
+
+  /** symbolic link */
+  svn_kind_symlink,
+
+  /** something's here, but we don't know what */
+  svn_kind_unknown
+} svn_kind_t;
+
 /** Return a constant string expressing @a kind as an English word, e.g.,
  * "file", "dir", etc.  The string is not localized, as it may be used for
  * client<->server communications.  If the kind is not recognized, return

Modified: subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c?rev=1180839&r1=1180838&r2=1180839&view=diff
==
--- subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c 
(original)
+++ subversion/branches/tree-read-api/subversion/libsvn_ra/ra_loader.c Mon Oct 
10 09:26:07 2011
@@ -902,6 +902,38 @@ svn_error_t *svn_ra_get_log2(svn_ra_sess
   receiver, receiver_baton, pool);
 }
 
+svn_error_t *
+svn_ra_check_path2(svn_ra_session_t *session,
+   const char *path,
+   svn_revnum_t revision,
+   svn_kind_t *kind,
+   apr_pool_t *scratch_pool)
+{
+  svn_node_kind_t node_kind;
+
+  SVN_ERR(svn_ra_check_path(session, path, revision,
+