svn commit: r1186017 - /subversion/trunk/CHANGES

[danielsh]

Author: danielsh
Date: Wed Oct 19 08:00:27 2011
New Revision: 1186017

URL: http://svn.apache.org/viewvc?rev=1186017view=rev
Log:
* CHANGES: Typo fix

Modified:
subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1186017r1=1186016r2=1186017view=diff
==
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Wed Oct 19 08:00:27 2011
@@ -34,7 +34,7 @@ http://svn.apache.org/repos/asf/subversi
* improve test suite correctness (r1174111)
* fix potential segfault seen by TSVN (r1183263)
* fix backward compat crashes in JavaHL (r1183054, -347)
-   * fill in repos_* fiels of svn_wc_status3_t for repos-only nodes (r1181609)
+   * fill in repos_* fields of svn_wc_status3_t for repos-only nodes (r1181609)
 
 
 Version 1.7.0

svn commit: r1186051 - /subversion/site/publish/mailing-lists.html

[stsp]

Author: stsp
Date: Wed Oct 19 09:34:59 2011
New Revision: 1186051

URL: http://svn.apache.org/viewvc?rev=1186051view=rev
Log:
* site/publish/mailing-lists.html: Put the archive search box before the
   list address, to encourage people even more to search before posting.
   Change the users@ address link below the search box to point to this
   page's #users-ml section, rather than mailto:users@.s.a.o. This way,
   we get people to read the users mailing list notes.

Suggested by: Alan Barrett

Modified:
subversion/site/publish/mailing-lists.html

Modified: subversion/site/publish/mailing-lists.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/mailing-lists.html?rev=1186051r1=1186050r2=1186051view=diff
==
--- subversion/site/publish/mailing-lists.html (original)
+++ subversion/site/publish/mailing-lists.html Wed Oct 19 09:34:59 2011
@@ -23,12 +23,7 @@
 
 div class=bigpoint
 
-pIf you have a question, please post it to:/p
-
-pa href=mailto:us...@subversion.apache.org;
-  us...@subversion.apache.org/a/p
-p
-  But please search the archives before posting your question:
+p If you have a question, please search the archives:
   !-- SiteSearch Google --
   form method=get action=http://www.google.com/custom; target=_top
   input type=hidden name=domains value=svn.haxx.se
@@ -47,6 +42,10 @@
   nbsp;
 /p
 
+pIf you cannot find an answer in the archives,
+   please post your question to:/p
+pa href=#users-mlus...@subversion.apache.org/a/p
+
 /div !-- .bigpoint --
 
 pYou do emnot/em need to be subscribed to post.  But if it's

svn commit: r1186052 - /subversion/site/publish/mailing-lists.html

[stsp]

Author: stsp
Date: Wed Oct 19 09:40:32 2011
New Revision: 1186052

URL: http://svn.apache.org/viewvc?rev=1186052view=rev
Log:
* publish/mailing-lists.html: Duplicate the information that no subscription
   is needed to post inside the users@ and dev@ mailing list table entries.
   (This question is asked commonly by people who don't read the whole text
   on this page.)

Modified:
subversion/site/publish/mailing-lists.html

Modified: subversion/site/publish/mailing-lists.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/mailing-lists.html?rev=1186052r1=1186051r2=1186052view=diff
==
--- subversion/site/publish/mailing-lists.html (original)
+++ subversion/site/publish/mailing-lists.html Wed Oct 19 09:40:32 2011
@@ -110,9 +110,11 @@
 /tr
 tr
   tdstrongSubscribe:/strong/td
-  tda href=mailto:users-subscr...@subversion.apache.org;
+  tdSend an email to
+  a href=mailto:users-subscr...@subversion.apache.org;
title=users-subscr...@subversion.apache.org
-  users-subscr...@subversion.apache.org/a/td
+  users-subscr...@subversion.apache.org/a
+  (you don't need to be subscribed to post)/td
 /tr
 tr
   tdstrongArchives:/strong/td
@@ -162,9 +164,11 @@
 /tr
 tr
   tdstrongSubscribe:/strong/td
-  tda href=mailto:dev-subscr...@subversion.apache.org;
+  tdSend an email to
+  a href=mailto:dev-subscr...@subversion.apache.org;
title=dev-subscr...@subversion.apache.org
-  dev-subscr...@subversion.apache.org/a/td
+  dev-subscr...@subversion.apache.org/a
+  (you don't need to be subscribed to post)/td
 /tr
 tr
   tdstrongArchives:/strong/td

svn commit: r1186059 - /subversion/trunk/subversion/svn/add-cmd.c

[stsp]

Author: stsp
Date: Wed Oct 19 09:48:43 2011
New Revision: 1186059

URL: http://svn.apache.org/viewvc?rev=1186059view=rev
Log:
* subversion/svn/add-cmd.c
  (svn_cl__add): Test the right error codes when deciding whether to report
   about targets which could not be added.

Found by: julianfoad

Modified:
subversion/trunk/subversion/svn/add-cmd.c

Modified: subversion/trunk/subversion/svn/add-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/add-cmd.c?rev=1186059r1=1186058r2=1186059view=diff
==
--- subversion/trunk/subversion/svn/add-cmd.c (original)
+++ subversion/trunk/subversion/svn/add-cmd.c Wed Oct 19 09:48:43 2011
@@ -95,11 +95,11 @@ svn_cl__add(apr_getopt_t *os,
   for (i = 0; i  errors-nelts; i++)
 {
   apr_status_t status = APR_ARRAY_IDX(errors, i, apr_status_t);
-  if (status == SVN_ERR_ENTRY_NOT_FOUND)
+  if (status == SVN_ERR_WC_PATH_NOT_FOUND)
 err = svn_error_quick_wrap(err,
_(Could not add all targets because 
  some targets don't exist));
-  else if (status == SVN_ERR_UNVERSIONED_RESOURCE)
+  else if (status == SVN_ERR_ENTRY_EXISTS)
 err = svn_error_quick_wrap(err,
_(Could not add all targets because 
  some targets are already 
versioned));

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

[stsp]

Author: stsp
Date: Wed Oct 19 09:50:00 2011
New Revision: 1186061

URL: http://svn.apache.org/viewvc?rev=1186061view=rev
Log:
* STATUS: Add 1186059 to r1185746 nomination.

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=1186061r1=1186060r2=1186061view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 09:50:00 2011
@@ -113,7 +113,7 @@ Candidate changes:
  +1: rhuijben (after r1185280 has been backported)
  +1: ivan
 
- * r1185746
+ * r1185746, r1186059
Fix up some erroneous Could not frob some targets because... warnings.
Votes:
  +1: stsp

svn commit: r1186064 - /subversion/trunk/CHANGES

[stsp]

Author: stsp
Date: Wed Oct 19 10:02:46 2011
New Revision: 1186064

URL: http://svn.apache.org/viewvc?rev=1186064view=rev
Log:
* CHANGES: typo

Modified:
subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1186064r1=1186063r2=1186064view=diff
==
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Wed Oct 19 10:02:46 2011
@@ -23,7 +23,7 @@ http://svn.apache.org/repos/asf/subversi
* error instead of assert when upgrading corrupt WCs (r1182904, -9)
* improve memory usage in merge (r1176915)
* fix an assertion in merge (r1149103, -35)
-   * improve performance of 'merge --reintegrate) (r1167681)
+   * improve performance of 'merge --reintegrate' (r1167681)
 
   Developer-visible changes:
* fix object lifetime issues in the JavaHL bindings (r1175888)

svn commit: r1186066 - in /subversion/trunk/subversion/libsvn_client: blame.c client.h log.c mergeinfo.c ra.c

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 10:08:23 2011
New Revision: 1186066

URL: http://svn.apache.org/viewvc?rev=1186066view=rev
Log:
Don't force callers of svn_client__ra_session_from_path() to receive
unwanted outputs: make the 'rev_p' and 'url_p' parameters optional.

* subversion/libsvn_client/client.h
  (svn_client__ra_session_from_path): Document 'rev_p' and 'url_p' as
optional.

* subversion/libsvn_client/blame.c
  (svn_client_blame5): Don't receive an unwanted URL.

* subversion/libsvn_client/log.c
  (svn_client_log5): Don't receive an unwanted revnum.

* subversion/libsvn_client/mergeinfo.c
  (svn_client_mergeinfo_log): Don't receive an unwanted URL.

* subversion/libsvn_client/ra.c
  (resolve_rev_and_url, svn_client__ra_session_from_path): Make 'rev_p' and
'url_p' optional.
  (svn_client__get_youngest_common_ancestor): Don't receive unwanted outputs.

Modified:
subversion/trunk/subversion/libsvn_client/blame.c
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/log.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_client/ra.c

Modified: subversion/trunk/subversion/libsvn_client/blame.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/blame.c?rev=1186066r1=1186065r2=1186066view=diff
==
--- subversion/trunk/subversion/libsvn_client/blame.c (original)
+++ subversion/trunk/subversion/libsvn_client/blame.c Wed Oct 19 10:08:23 2011
@@ -592,7 +592,6 @@ svn_client_blame5(const char *target,
 {
   struct file_rev_baton frb;
   svn_ra_session_t *ra_session;
-  const char *url;
   svn_revnum_t start_revnum, end_revnum;
   struct blame *walk, *walk_merged = NULL;
   apr_pool_t *iterpool;
@@ -611,9 +610,8 @@ svn_client_blame5(const char *target,
 SVN_ERR(svn_dirent_get_absolute(target_abspath_or_url, target, pool));
 
   /* Get an RA plugin for this filesystem object. */
-  SVN_ERR(svn_client__ra_session_from_path(ra_session, end_revnum,
-   url, target, NULL,
-   peg_revision, end,
+  SVN_ERR(svn_client__ra_session_from_path(ra_session, end_revnum, NULL,
+   target, NULL, peg_revision, end,
ctx, pool));
 
   SVN_ERR(svn_client__get_revision_number(start_revnum, NULL, ctx-wc_ctx,

Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1186066r1=1186065r2=1186066view=diff
==
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Wed Oct 19 10:08:23 2011
@@ -202,7 +202,7 @@ svn_client__get_youngest_common_ancestor
 
Store the resulting ra_session in *RA_SESSION_P.  Store the actual
revision number of the object in *REV_P, and the final resulting
-   URL in *URL_P.
+   URL in *URL_P. REV_P and/or URL_P may be NULL if not wanted.
 
Use authentication baton cached in CTX to authenticate against the
repository.

Modified: subversion/trunk/subversion/libsvn_client/log.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/log.c?rev=1186066r1=1186065r2=1186066view=diff
==
--- subversion/trunk/subversion/libsvn_client/log.c (original)
+++ subversion/trunk/subversion/libsvn_client/log.c Wed Oct 19 10:08:23 2011
@@ -283,7 +283,6 @@ svn_client_log5(const apr_array_header_t
   svn_boolean_t has_log_revprops;
   const char *actual_url;
   apr_array_header_t *condensed_targets;
-  svn_revnum_t ignored_revnum;
   svn_opt_revision_t session_opt_rev;
   const char *ra_target;
   pre_15_receiver_baton_t rb = {0};
@@ -485,8 +484,8 @@ svn_client_log5(const apr_array_header_t
 else
   ra_target = url_or_path;
 
-SVN_ERR(svn_client__ra_session_from_path(ra_session, ignored_revnum,
- actual_url, ra_target, NULL,
+SVN_ERR(svn_client__ra_session_from_path(ra_session, NULL, actual_url,
+ ra_target, NULL,
  peg_rev, session_opt_rev,
  ctx, pool));
 

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1186066r1=1186065r2=1186066view=diff
==
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Wed Oct 19 10:08:23 
2011
@@ -1803,19 +1803,18 @@ 

[Subversion Wiki] Update of MergeBugsAndErrorReporting by JulianFoad

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on Subversion Wiki for 
change notification.

The MergeBugsAndErrorReporting page has been changed by JulianFoad:
http://wiki.apache.org/subversion/MergeBugsAndErrorReporting?action=diffrev1=2rev2=3

  svn: E160013: '/repos/asf/!svn/bc/1182329/trunk' path not found
  }}}
  
+  * The message about recording mergeinfo at the end of a catch-up merge seems 
to report the wrong starting revision:
+ 
+ {{{
+ $ svn merge ^/subversion/trunk
+ --- Merging r1182861 through r1186071 into '.':
+ UMakefile.in
+ [...]
+ --- Recording mergeinfo for merge of r1177607 through r1186071 into '.':
+  U   .
+ 
+ $ svn pg -rBASE svn:mergeinfo | grep trunk
+ /subversion/trunk:1177607-1182860
+ 
+ $ svn pg svn:mergeinfo | grep trunk
+ /subversion/trunk:1177607-1186071
+ }}}
+ 

svn commit: r1186081 - /subversion/branches/showing-merge-info/subversion/include/svn_client.h

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 10:40:41 2011
New Revision: 1186081

URL: http://svn.apache.org/viewvc?rev=1186081view=rev
Log:
On the 'showing-merge-info' branch: Fix a doc string.

* subversion/include/svn_client.h
  (svn_client_cat3): Fix doc string.

Modified:
subversion/branches/showing-merge-info/subversion/include/svn_client.h

Modified: subversion/branches/showing-merge-info/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/include/svn_client.h?rev=1186081r1=1186080r2=1186081view=diff
==
--- subversion/branches/showing-merge-info/subversion/include/svn_client.h 
(original)
+++ subversion/branches/showing-merge-info/subversion/include/svn_client.h Wed 
Oct 19 10:40:41 2011
@@ -5218,8 +5218,7 @@ svn_client_ls(apr_hash_t **dirents,
  * Output the content of a file.
  *
  * @param[in] out   The stream to which the content will be written.
- * @param[in] path_or_url   The path or URL of the file.
- * @param[in] peg_revision  The peg revision.
+ * @param[in] targetThe path or URL and peg revision of the file.
  * @param[in] revision  The operative revision.
  * @param[in] ctx   The standard client context, used for possible
  *  authentication.

svn commit: r1186083 - in /subversion/branches/showing-merge-info/subversion: include/svn_client.h libsvn_client/url.c

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 10:46:57 2011
New Revision: 1186083

URL: http://svn.apache.org/viewvc?rev=1186083view=rev
Log:
On the 'showing-merge-info' branch: Two-pool paradigm.

* subversion/include/svn_client.h,
  subversion/libsvn_client/url.c
  (svn_client__resolve_location, svn_client__resolve_target_location): Use 
two-pool paradigm.

Modified:
subversion/branches/showing-merge-info/subversion/include/svn_client.h
subversion/branches/showing-merge-info/subversion/libsvn_client/url.c

Modified: subversion/branches/showing-merge-info/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/include/svn_client.h?rev=1186083r1=1186082r2=1186083view=diff
==
--- subversion/branches/showing-merge-info/subversion/include/svn_client.h 
(original)
+++ subversion/branches/showing-merge-info/subversion/include/svn_client.h Wed 
Oct 19 10:46:57 2011
@@ -1052,13 +1052,14 @@ svn_client__resolve_location(const char 
  const svn_opt_revision_t *peg_revision,
  const svn_opt_revision_t *revision,
  svn_client_ctx_t *ctx,
- apr_pool_t *pool);
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
 
 /* */
 svn_error_t *
 svn_client__resolve_target_location(svn_client_target_t *target,
 svn_client_ctx_t *ctx,
-apr_pool_t *pool);
+apr_pool_t *scratch_pool);
 
 /**
  * Pull remaining target arguments from @a os into @a *targets_p,

Modified: subversion/branches/showing-merge-info/subversion/libsvn_client/url.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_client/url.c?rev=1186083r1=1186082r2=1186083view=diff
==
--- subversion/branches/showing-merge-info/subversion/libsvn_client/url.c 
(original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_client/url.c Wed 
Oct 19 10:46:57 2011
@@ -120,7 +120,8 @@ svn_client__resolve_location(const char 
  const svn_opt_revision_t *peg_revision,
  const svn_opt_revision_t *revision,
  svn_client_ctx_t *ctx,
- apr_pool_t *pool)
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
 {
   const char *abspath_or_url;
   const char *repos_root_url;
@@ -128,11 +129,12 @@ svn_client__resolve_location(const char 
   if (svn_path_is_url(path_or_url))
 abspath_or_url = path_or_url;
   else
-SVN_ERR(svn_dirent_get_absolute(abspath_or_url, path_or_url, pool));
+SVN_ERR(svn_dirent_get_absolute(abspath_or_url, path_or_url,
+scratch_pool));
 
   SVN_ERR(svn_client__get_repos_root(repos_root_url, repo_uuid_p,
  abspath_or_url,
- ctx, pool, pool));
+ ctx, result_pool, scratch_pool));
   if (repo_root_url_p)
 *repo_root_url_p = repos_root_url;
 
@@ -140,12 +142,14 @@ svn_client__resolve_location(const char 
 {
   const char *url;
 
-  SVN_ERR(svn_client_url_from_path2(url, path_or_url, ctx, pool, pool));
+  SVN_ERR(svn_client_url_from_path2(url, path_or_url,
+ctx, scratch_pool, scratch_pool));
   if (! url)
 return svn_error_createf(SVN_ERR_ENTRY_MISSING_URL, NULL,
  _(Path '%s' has no URL in the repository),
  path_or_url);
-  *repo_relpath_p = svn_uri_skip_ancestor(repos_root_url, url, pool);
+  *repo_relpath_p = svn_uri_skip_ancestor(repos_root_url, url,
+  result_pool);
 }
 
   if (repo_revnum_p)
@@ -158,7 +162,7 @@ svn_client__resolve_location(const char 
   abspath_or_url,
   ra_session,
   peg_revision,
-  pool));
+  scratch_pool));
 }
   return SVN_NO_ERROR;
 }
@@ -166,7 +170,7 @@ svn_client__resolve_location(const char 
 svn_error_t *
 svn_client__resolve_target_location(svn_client_target_t *target,
 svn_client_ctx_t *ctx,
-apr_pool_t *pool)
+apr_pool_t *scratch_pool)
 {
   SVN_ERR(svn_client__resolve_location(target-repos_root_url,
target-repos_uuid,
@@ -175,7 +179,7 

svn commit: r1186088 - in /subversion/branches/showing-merge-info/subversion/libsvn_client: client.h ra.c

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 10:55:57 2011
New Revision: 1186088

URL: http://svn.apache.org/viewvc?rev=1186088view=rev
Log:
On the 'showing-merge-info' branch: Add svn_client__ra_session_from_path().

* subversion/libsvn_client/client.h,
  subversion/libsvn_client/ra.c
  (svn_client__ra_session_from_path): New function.

Modified:
subversion/branches/showing-merge-info/subversion/libsvn_client/client.h
subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c

Modified: 
subversion/branches/showing-merge-info/subversion/libsvn_client/client.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_client/client.h?rev=1186088r1=1186087r2=1186088view=diff
==
--- subversion/branches/showing-merge-info/subversion/libsvn_client/client.h 
(original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_client/client.h 
Wed Oct 19 10:55:57 2011
@@ -219,6 +219,17 @@ svn_client__ra_session_from_path(svn_ra_
  svn_client_ctx_t *ctx,
  apr_pool_t *pool);
 
+/* Open an RA session (not connected to a WC) to TARGET.
+ * Similar to svn_client__ra_session_from_path() without BASE_DIR_ABSPATH. */
+svn_error_t *
+svn_client__ra_session_from_target(svn_ra_session_t **ra_session_p,
+   svn_revnum_t *rev_p,
+   const char **url_p,
+   svn_client_target_t *target,
+   const svn_opt_revision_t *revision,
+   svn_client_ctx_t *ctx,
+   apr_pool_t *pool);
+
 /* Ensure that RA_SESSION's session URL matches SESSION_URL,
reparenting that session if necessary.  If reparenting occurs,
store the previous session URL in *OLD_SESSION_URL (so that if the

Modified: subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c?rev=1186088r1=1186087r2=1186088view=diff
==
--- subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c 
(original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c Wed 
Oct 19 10:55:57 2011
@@ -541,6 +541,21 @@ svn_client__ra_session_from_path(svn_ra_
   return SVN_NO_ERROR;
 }
 
+svn_error_t *
+svn_client__ra_session_from_target(svn_ra_session_t **ra_session_p,
+   svn_revnum_t *rev_p,
+   const char **url_p,
+   svn_client_target_t *target,
+   const svn_opt_revision_t *revision,
+   svn_client_ctx_t *ctx,
+   apr_pool_t *pool)
+{
+  SVN_ERR(svn_client__ra_session_from_path(ra_session_p, rev_p, url_p,
+   target-path_or_url, NULL,
+   target-peg_revision, revision,
+   ctx, pool));
+  return SVN_NO_ERROR;
+}
 
 svn_error_t *
 svn_client__ensure_ra_session_url(const char **old_session_url,

svn commit: r1186092 - in /subversion/trunk/subversion/tests/cmdline: upgrade_tests.py upgrade_tests_data/upgrade_missing_replaced.tar.bz2

[philip]

Author: philip
Date: Wed Oct 19 11:08:17 2011
New Revision: 1186092

URL: http://svn.apache.org/viewvc?rev=1186092view=rev
Log:
Add regression test for issue 4035, checksum!=NULL assert after upgrade.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_missing_replaced): New test.
  (test_list): Add new test.

* subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2:
  New.

Added:

subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
   (with props)
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186092r1=1186091r2=1186092view=diff
==
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 
11:08:17 2011
@@ -1233,6 +1233,27 @@ def upgrade_absent(sbox):
   svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
 None, None)
 
+@Issue(4035)
+@Wimp(4035)
+def upgrade_missing_replaced(sbox):
+  upgrade with missing replaced dir
+
+  sbox.build(read_only=True)
+  replace_sbox_with_tarfile(sbox, 'upgrade_missing_replaced.tar.bz2')
+
+  svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+  svntest.main.run_svnadmin('setuuid', sbox.repo_dir,
+'d7130b12-92f6-45c9-9217-b9f0472c3fab')
+  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+ 'file:///tmp/repo', sbox.repo_url,
+ sbox.wc_dir)
+
+  expected_output = svntest.wc.State(sbox.wc_dir, {
+  'A/B/E/alpha'  : Item(status='A '),
+  })
+  svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
+None, None)
+
 
 # Run the tests
 
@@ -1283,6 +1304,7 @@ test_list = [ None,
   upgrade_locked,
   upgrade_file_externals,
   upgrade_absent,
+  upgrade_missing_replaced,
  ]
 
 

Added: 
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2?rev=1186092view=auto
==
Binary file - no diff available.

Propchange: 
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
--
svn:mime-type = application/x-bzip2

svn commit: r1186101 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

[philip]

Author: philip
Date: Wed Oct 19 11:19:14 2011
New Revision: 1186101

URL: http://svn.apache.org/viewvc?rev=1186101view=rev
Log:
Extend a failing test.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_missing_replaced): Adjust expectations, add status call.

Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186101r1=1186100r2=1186101view=diff
==
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 
11:19:14 2011
@@ -1249,10 +1249,15 @@ def upgrade_missing_replaced(sbox):
  sbox.wc_dir)
 
   expected_output = svntest.wc.State(sbox.wc_dir, {
-  'A/B/E/alpha'  : Item(status='A '),
+  'A/B/E' : Item(status='  ', treeconflict='C'),
+  'A/B/E/alpha'   : Item(status='  ', treeconflict='A'),
+  'A/B/E/beta': Item(status='  ', treeconflict='A'),
   })
+  expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
+  expected_status.tweak('A/B/E', status='! ', treeconflict='C', wc_rev='-')
+  expected_status.tweak('A/B/E/alpha', 'A/B/E/beta', status='D ')
   svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
-None, None)
+None, expected_status)
 
 
 # Run the tests

svn propchange: r1186088 - svn:log

[julianfoad]

Author: julianfoad
Revision: 1186088
Modified property: svn:log

Modified: svn:log at Wed Oct 19 11:19:14 2011
--
--- svn:log (original)
+++ svn:log Wed Oct 19 11:19:14 2011
@@ -1,5 +1,5 @@
-On the 'showing-merge-info' branch: Add svn_client__ra_session_from_path().
+On the 'showing-merge-info' branch: Add svn_client__ra_session_from_target().
 
 * subversion/libsvn_client/client.h,
   subversion/libsvn_client/ra.c
-  (svn_client__ra_session_from_path): New function.
+  (svn_client__ra_session_from_target): New function.

svn commit: r1186107 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

[philip]

Author: philip
Date: Wed Oct 19 11:26:29 2011
New Revision: 1186107

URL: http://svn.apache.org/viewvc?rev=1186107view=rev
Log:
Extend a failing test.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_missing_replaced): Add revert call.

Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186107r1=1186106r2=1186107view=diff
==
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 
11:26:29 2011
@@ -1259,6 +1259,11 @@ def upgrade_missing_replaced(sbox):
   svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
 None, expected_status)
 
+  svntest.actions.run_and_verify_svn(None, 'Reverted.*', [], 'revert', '-R',
+ sbox.wc_dir)
+  expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
+  svntest.actions.run_and_verify_status(sbox.wc_dir, expected_status)
+
 
 # Run the tests
 

svn commit: r1186109 - in /subversion/trunk/subversion: libsvn_wc/wc_db.c tests/cmdline/upgrade_tests.py

[philip]

Author: philip
Date: Wed Oct 19 11:30:26 2011
New Revision: 1186109

URL: http://svn.apache.org/viewvc?rev=1186109view=rev
Log:
Fix issue 4035, checksum!=NULL assert after upgrade.  The major part
of the fix is r1177732, this commit adjusts the verification code.

* subversion/libsvn_wc/wc_db.c
  (scan_addition_txn, scan_deletion_txn): Allow working/incomplete in
   asserts.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_missing_replaced): Remove WIMP.

Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1186109r1=1186108r2=1186109view=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Oct 19 11:30:26 2011
@@ -9665,6 +9665,7 @@ scan_addition_txn(void *baton,
 {
   SVN_ERR_ASSERT(*sab-status == svn_wc__db_status_added
  || *sab-status == svn_wc__db_status_copied
+ || *sab-status == svn_wc__db_status_incomplete
  || *sab-status == svn_wc__db_status_moved_here);
   if (*sab-status == svn_wc__db_status_added)
 {
@@ -9918,8 +9919,8 @@ scan_deletion_txn(void *baton,
 local_relpath,
 scratch_pool));
 
-  /* ### incomplete not handled */
   SVN_ERR_ASSERT(work_presence == svn_wc__db_status_normal
+ || work_presence == svn_wc__db_status_incomplete
  || work_presence == svn_wc__db_status_not_present
  || work_presence == svn_wc__db_status_base_deleted);
 

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186109r1=1186108r2=1186109view=diff
==
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 
11:30:26 2011
@@ -1234,7 +1234,6 @@ def upgrade_absent(sbox):
 None, None)
 
 @Issue(4035)
-@Wimp(4035)
 def upgrade_missing_replaced(sbox):
   upgrade with missing replaced dir
 

svn commit: r1186121 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[stsp]

Author: stsp
Date: Wed Oct 19 11:48:10 2011
New Revision: 1186121

URL: http://svn.apache.org/viewvc?rev=1186121view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
  (validate_root_noderev): Remove documentation of nonexistent parameter.

Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1186121r1=1186120r2=1186121view=diff
==
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Oct 19 11:48:10 2011
@@ -5837,7 +5837,7 @@ write_hash_rep(svn_filesize_t *size,
 }
 
 /* Sanity check ROOT_NODEREV, a candidate for being the root node-revision
-   of (not yet committed) revision REV.  Use OCEAN for temporary allocations.
+   of (not yet committed) revision REV.
  */
 static APR_INLINE svn_error_t *
 validate_root_noderev(node_revision_t *root_noderev,

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

[stsp]

Author: stsp
Date: Wed Oct 19 11:54:07 2011
New Revision: 1186128

URL: http://svn.apache.org/viewvc?rev=1186128view=rev
Log:
* STATUS: Vote, approving two nominations.

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=1186128r1=1186127r2=1186128view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 11:54:07 2011
@@ -63,18 +63,11 @@ Candidate changes:
  running 'svn info --depth infinity' shows it to be 2 or 3 times faster.
  On a larger working copy it's orders of magnitude faster.
Votes:
- +1: philip
+ +1: philip, stsp
  +0: peters, gstein (looks correct, but I didn't test, and while
  performance should be better, I wonder if that's
  been tested at all)
 
- * r1178280, r1178282
-   Add a sanity check to FSFS.
-   Justification:
- Detects a user-visible corruption seen on svn-master.apache.org.
-   Votes:
- +1: danielsh, rhuijben
-
  * r1178942, r1182527
Fix issue #4009, Big trivial text files merged MUCH slower than binary
Justification:
@@ -82,17 +75,6 @@ Candidate changes:
Votes:
  +1: stsp, pburba
 
- 
- * r1185222
-   Make 'svn add --parents D/file' work if D is deleted.
-   'svn add D; svn add D/file' would work. 
-   Justification:
- Makes it easier to use 'svn add --parents'.
- Reported on the AnkhSVN error list a few times. It's better to apply this
- fix here than having to fix all clients.
-   Votes:
- +1: rhuijben, pburba
-
  * r1185280, r1185282
Open SQLite databases as writable in some test code before we try to update
the database.
@@ -147,3 +129,20 @@ Veto-blocked changes:
 
 Approved changes:
 =
+ 
+ * r1185222
+   Make 'svn add --parents D/file' work if D is deleted.
+   'svn add D; svn add D/file' would work. 
+   Justification:
+ Makes it easier to use 'svn add --parents'.
+ Reported on the AnkhSVN error list a few times. It's better to apply this
+ fix here than having to fix all clients.
+   Votes:
+ +1: rhuijben, pburba, stsp
+
+ * r1178280, r1178282
+   Add a sanity check to FSFS.
+   Justification:
+ Detects a user-visible corruption seen on svn-master.apache.org.
+   Votes:
+ +1: danielsh, rhuijben, stsp

svn commit: r1186139 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/wc-queries.sql subversion/libsvn_wc/wc_db.c

[hwright]

Author: hwright
Date: Wed Oct 19 12:11:06 2011
New Revision: 1186139

URL: http://svn.apache.org/viewvc?rev=1186139view=rev
Log:
Merge r1164426, r1164614 from trunk:

 * r1164426, r1164614
   Fix STMT_SELECT_NODE_CHILDREN_WALKER_INFO for correctness and speed.
   Justification:
 Recursive info and propset don't scale well with large working copies
 and may possibly act on the wrong nodes.  Correctness discussion:
 http://colabti.org/irclogger/irclogger_log/svn-dev?date=2011-09-02#l214
 On a Linux machine with a Subversion trunk working copy on a local disk
 running 'svn info --depth infinity' shows it to be 2 or 3 times faster.
 On a larger working copy it's orders of magnitude faster.
   Votes:
 +1: philip, stsp
 +1: rhuijben (works better than the original code, but there are better
   ways for 1.8+)
 +0: peters, gstein (looks correct, but I didn't test, and while
 performance should be better, I wonder if that's
 been tested at all)

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql
subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:11:06 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1179680,1179767,1181155,1181609,1181666,1182115,1182904,1182909,1183054,1183263,1183347,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

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

[stsp]

Author: stsp
Date: Wed Oct 19 12:12:07 2011
New Revision: 1186141

URL: http://svn.apache.org/viewvc?rev=1186141view=rev
Log:
* STATUS: nominate r1179767

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=1186141r1=1186140r2=1186141view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 12:12:07 2011
@@ -59,7 +59,7 @@ Candidate changes:
Justification:
  General correctness and the tests start failing after r1185242.
Votes:
- +1: rhuijben
+ +1: rhuijben, stsp

  * r1185242
Don't enable the SQLite shared process cache.

svn propchange: r1186141 - svn:log

[stsp]

Author: stsp
Revision: 1186141
Modified property: svn:log

Modified: svn:log at Wed Oct 19 12:13:12 2011
--
--- svn:log (original)
+++ svn:log Wed Oct 19 12:13:12 2011
@@ -1 +1 @@
-* STATUS: nominate r1179767
+* STATUS: Vote for r1185280 group.

svn commit: r1186144 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_fs_fs/fs_fs.c

[hwright]

Author: hwright
Date: Wed Oct 19 12:14:42 2011
New Revision: 1186144

URL: http://svn.apache.org/viewvc?rev=1186144view=rev
Log:
Merge r1178280, r1178282 from trunk:

 * r1178280, r1178282
   Add a sanity check to FSFS.
   Justification:
 Detects a user-visible corruption seen on svn-master.apache.org.
   Votes:
 +1: danielsh, rhuijben, stsp

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

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:14:42 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1179680,1179767,1181155,1181609,1181666,1182115,1182904,1182909,1183054,1183263,
 1183347,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1179680,1179767,1181155,1181609,1181666,1182115,1182904,1182909,
 1183054,1183263,1183347,1185730

Modified: subversion/branches/1.7.x/STATUS
URL: 

svn commit: r1186148 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/merge.c

[hwright]

Author: hwright
Date: Wed Oct 19 12:16:58 2011
New Revision: 1186148

URL: http://svn.apache.org/viewvc?rev=1186148view=rev
Log:
Merge r1178942, r1182527 from trunk:

 * r1178942, r1182527
   Fix issue #4009, Big trivial text files merged MUCH slower than binary
   Justification:
 Much improved merge performance for, well, trivial text file merges!
   Votes:
 +1: stsp, pburba, rhuijben

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

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:16:58 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1179680,1179767,1181155,1181609,1181666,1182115,1182904,1182909,
 1183054,1183263,1183347,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,1182115,1182527,
 1182904,1182909,1183054,1183263,1183347,1185730

Modified: 

svn commit: r1186150 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/add.c subversion/tests/cmdline/basic_tests.py

[hwright]

Author: hwright
Date: Wed Oct 19 12:17:59 2011
New Revision: 1186150

URL: http://svn.apache.org/viewvc?rev=1186150view=rev
Log:
Merge r1185222 from trunk:

 * r1185222
   Make 'svn add --parents D/file' work if D is deleted.
   'svn add D; svn add D/file' would work. 
   Justification:
 Makes it easier to use 'svn add --parents'.
 Reported on the AnkhSVN error list a few times. It's better to apply this
 fix here than having to fix all clients.
   Votes:
 +1: rhuijben, pburba, stsp

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/add.c
subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py   
(contents, props changed)

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:17: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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,1182115,1182527,
 1182904,1182909,1183054,1183263,1183347,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

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

[hwright]

Author: hwright
Date: Wed Oct 19 12:19:52 2011
New Revision: 1186154

URL: http://svn.apache.org/viewvc?rev=1186154view=rev
Log:
* STATUS: Vote and approve $GROUPS.

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=1186154r1=1186153r2=1186154view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 12:19:52 2011
@@ -53,26 +53,6 @@ Candidate changes:
Votes:
  +1: pburba, rhuijben
 
- * r1185280, r1185282
-   Open SQLite databases as writable in some test code before we try to update
-   the database.
-   Justification:
- General correctness and the tests start failing after r1185242.
-   Votes:
- +1: rhuijben, stsp
-   
- * r1185242
-   Don't enable the SQLite shared process cache.
-   Justification:
- Resolves common errors of multithreaded application users.
-   Notes:
- See also log message of this revision.
- If r1185280 isn't applied before this patch the op-depth tests will
- start failing.
-   Votes:
- +1: rhuijben (after r1185280 has been backported)
- +1: ivan
-
  * r1185746, r1186059
Fix up some erroneous Could not frob some targets because... warnings.
Votes:
@@ -107,3 +87,23 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1185280, r1185282
+   Open SQLite databases as writable in some test code before we try to update
+   the database.
+   Justification:
+ General correctness and the tests start failing after r1185242.
+   Votes:
+ +1: rhuijben, stsp, hwright
+   
+ * r1185242
+   Don't enable the SQLite shared process cache.
+   Justification:
+ Resolves common errors of multithreaded application users.
+   Notes:
+ See also log message of this revision.
+ If r1185280 isn't applied before this patch the op-depth tests will
+ start failing.
+   Votes:
+ +1: rhuijben (after r1185280 has been backported)
+ +1: ivan, hwright

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

[stsp]

Author: stsp
Date: Wed Oct 19 12:23:15 2011
New Revision: 1186157

URL: http://svn.apache.org/viewvc?rev=1186157view=rev
Log:
* STATUS: Approve r1163243 group.

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=1186157r1=1186156r2=1186157view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 12:23:15 2011
@@ -42,17 +42,6 @@ Candidate changes:
  -0: stsp (we can backport these when we need to)
  -0: gstein
 
- * r1163243, r1163383
-   Fix issue #3791 'svn mergeinfo shows natural history of added subtrees
-   as eligible'.
-   Justification:
- The 'svn mergeinfo [ -R | --depth [ files | immediates | infinity ] ]'
- subcommand gives incorrect answers in some use cases.
-   Notes:
- r1163243 is a test for the issue, r1163383 is the fix.
-   Votes:
- +1: pburba, rhuijben
-
  * r1185746, r1186059
Fix up some erroneous Could not frob some targets because... warnings.
Votes:
@@ -107,3 +96,14 @@ Approved changes:
Votes:
  +1: rhuijben (after r1185280 has been backported)
  +1: ivan, hwright
+
+ * r1163243, r1163383
+   Fix issue #3791 'svn mergeinfo shows natural history of added subtrees
+   as eligible'.
+   Justification:
+ The 'svn mergeinfo [ -R | --depth [ files | immediates | infinity ] ]'
+ subcommand gives incorrect answers in some use cases.
+   Notes:
+ r1163243 is a test for the issue, r1163383 is the fix.
+   Votes:
+ +1: pburba, rhuijben, stsp

svn commit: r1186158 - in /subversion/branches/1.7.x: ./ STATUS subversion/tests/libsvn_wc/op-depth-test.c

[hwright]

Author: hwright
Date: Wed Oct 19 12:24:44 2011
New Revision: 1186158

URL: http://svn.apache.org/viewvc?rev=1186158view=rev
Log:
Merge r1185280, r1185282 from trunk:

 * r1185280, r1185282
   Open SQLite databases as writable in some test code before we try to update
   the database.
   Justification:
 General correctness and the tests start failing after r1185242.
   Votes:
 +1: rhuijben, stsp, hwright

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:24: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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,1182115,1182527,
 1182904,1182909,1183054,1183263,1183347,1185222,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,1182115,1182527,
 

svn commit: r1186163 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/sqlite.c

[hwright]

Author: hwright
Date: Wed Oct 19 12:27:37 2011
New Revision: 1186163

URL: http://svn.apache.org/viewvc?rev=1186163view=rev
Log:
Merge r1185242 from trunk:
   
 * r1185242
   Don't enable the SQLite shared process cache.
   Justification:
 Resolves common errors of multithreaded application users.
   Notes:
 See also log message of this revision.
 If r1185280 isn't applied before this patch the op-depth tests will
 start failing.
   Votes:
 +1: rhuijben (after r1185280 has been backported)
 +1: ivan, hwright

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

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:27:37 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,1182115,1182527,
 1182904,1182909,1183054,1183263,1183347,1185222,1185280,1185282,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

svn commit: r1186167 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/mergeinfo.c subversion/tests/cmdline/mergeinfo_tests.py

[hwright]

Author: hwright
Date: Wed Oct 19 12:30:49 2011
New Revision: 1186167

URL: http://svn.apache.org/viewvc?rev=1186167view=rev
Log:
Merge r1163243, r1163383 from trunk:

 * r1163243, r1163383
   Fix issue #3791 'svn mergeinfo shows natural history of added subtrees
   as eligible'.
   Justification:
 The 'svn mergeinfo [ -R | --depth [ files | immediates | infinity ] ]'
 subcommand gives incorrect answers in some use cases.
   Notes:
 r1163243 is a test for the issue, r1163383 is the fix.
   Votes:
 +1: pburba, rhuijben, stsp

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/mergeinfo.c
subversion/branches/1.7.x/subversion/tests/cmdline/mergeinfo_tests.py

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:30: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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,1182115,1182527,
 1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

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

[stsp]

Author: stsp
Date: Wed Oct 19 12:49:01 2011
New Revision: 1186177

URL: http://svn.apache.org/viewvc?rev=1186177view=rev
Log:
* STATUS: Vote for r1185911.

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=1186177r1=1186176r2=1186177view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 12:49:01 2011
@@ -69,7 +69,7 @@ Candidate changes:
  r1185911 adds a simple test for this case and r1185918 resolves this
  regression.
Votes:
- +1: rhuijben
+ +1: rhuijben, stsp
 
 Veto-blocked changes:
 =

svn commit: r1186179 - /subversion/trunk/CHANGES

[stsp]

Author: stsp
Date: Wed Oct 19 12:57:28 2011
New Revision: 1186179

URL: http://svn.apache.org/viewvc?rev=1186179view=rev
Log:
* CHANGES: sync with recent merges to 1.7.x

Modified:
subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1186179r1=1186178r2=1186179view=diff
==
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Wed Oct 19 12:57:28 2011
@@ -15,7 +15,7 @@ http://svn.apache.org/repos/asf/subversi
 
   User-visible changes:
* improve performance of 'svn info' (r1164386)
-   * improve sorting performance (r1167659)
+   * improve hash table sorting performance (r1167659)
* update bash completion for 1.7 (r1177001)
* make 'svn ls' continue to work with 1.0-1.3 repos (r1154278, -379, -82)
* improve error messages generated by SASL (r1179767)
@@ -24,6 +24,11 @@ http://svn.apache.org/repos/asf/subversi
* improve memory usage in merge (r1176915)
* fix an assertion in merge (r1149103, -35)
* improve performance of 'merge --reintegrate' (r1167681)
+   * fixed: 'svn mergeinfo' shows wrong revisions for added nodes (issue #3791)
+   * make 'svn add --parents D/file' work if D is deleted (r1185222)
+   * improve performance of trivial text file merges (issue #4009)
+   * add FSFS sanity check to prevent corruption seen in the wild (r1178280)
+   * improve correctness/performance of recursive info and proplist (r1164426)
 
   Developer-visible changes:
* fix object lifetime issues in the JavaHL bindings (r1175888)
@@ -35,6 +40,7 @@ http://svn.apache.org/repos/asf/subversi
* fix potential segfault seen by TSVN (r1183263)
* fix backward compat crashes in JavaHL (r1183054, -347)
* fill in repos_* fields of svn_wc_status3_t for repos-only nodes (r1181609)
+   * disable the sqlite shared process cache (r1185242, r1185280)
 
 
 Version 1.7.0

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

[danielsh]

Author: danielsh
Date: Wed Oct 19 13:01:42 2011
New Revision: 1186183

URL: http://svn.apache.org/viewvc?rev=1186183view=rev
Log:
Unnominate the 1.7.x-fs-verify branch.

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=1186183r1=1186182r2=1186183view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 13:01:42 2011
@@ -15,24 +15,6 @@ Status of 1.7.1:
 Candidate changes:
 ==
 
- * r1146131 and followups
-   Add svn_fs_verify() and implement rep-cache verification in FSFS using it.
-   Branch:
- 1.7.x-fs-verify
-   Justification:
- Would be nice to extend verify already in 1.7.x.
-   Notes:
- This does not include progress reporting; that has been postponed to 1.8.
-   Conflicts:
- On fs_fs.c.  Resolve with 'theirs-conflict'.
-   Votes:
- +1: danielsh, rhuijben
- +0: gstein (progress would be nice) (without r1161164, r1161180)
- -0: cmpilato (For a function with this name, the implementation is far
- too anemic. I'd prefer this be a private function in 1.7.x, leaving
- room for a future public API that really does full verification.)
- (without r1161164, r1161180)
-
  * r1147540, r1147541
Remove unused variables in build system.
Justification:
@@ -74,5 +56,24 @@ Candidate changes:
 Veto-blocked changes:
 =
 
+ * r1146131 and followups
+   Add svn_fs_verify() and implement rep-cache verification in FSFS using it.
+   Branch:
+ 1.7.x-fs-verify
+   Justification:
+ Would be nice to extend verify already in 1.7.x.
+   Notes:
+ This does not include progress reporting; that has been postponed to 1.8.
+   Conflicts:
+ On fs_fs.c.  Resolve with 'theirs-conflict'.
+   Votes:
+ +1: danielsh, rhuijben
+ +0: gstein (progress would be nice) (without r1161164, r1161180)
+ -0: cmpilato (For a function with this name, the implementation is far
+ too anemic. I'd prefer this be a private function in 1.7.x, leaving
+ room for a future public API that really does full verification.)
+ (without r1161164, r1161180)
+ -1: danielsh (invasive, new feature)
+
 Approved changes:
 =

svn commit: r1186184 - /subversion/trunk/CHANGES

[stsp]

Author: stsp
Date: Wed Oct 19 13:01:45 2011
New Revision: 1186184

URL: http://svn.apache.org/viewvc?rev=1186184view=rev
Log:
* CHANGES: some wording tweaks

Modified:
subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1186184r1=1186183r2=1186184view=diff
==
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Wed Oct 19 13:01:45 2011
@@ -18,12 +18,12 @@ http://svn.apache.org/repos/asf/subversi
* improve hash table sorting performance (r1167659)
* update bash completion for 1.7 (r1177001)
* make 'svn ls' continue to work with 1.0-1.3 repos (r1154278, -379, -82)
-   * improve error messages generated by SASL (r1179767)
+   * improve handling of error messages generated by Cyrus SASL (r1179767)
* update INSTALL (r1182115, and others)
* error instead of assert when upgrading corrupt WCs (r1182904, -9)
* improve memory usage in merge (r1176915)
-   * fix an assertion in merge (r1149103, -35)
-   * improve performance of 'merge --reintegrate' (r1167681)
+   * fix an invalid assertion in merge (r1149103, -35)
+   * improve performance of 'merge --reintegrate' in edge case (r1167681)
* fixed: 'svn mergeinfo' shows wrong revisions for added nodes (issue #3791)
* make 'svn add --parents D/file' work if D is deleted (r1185222)
* improve performance of trivial text file merges (issue #4009)
@@ -40,7 +40,7 @@ http://svn.apache.org/repos/asf/subversi
* fix potential segfault seen by TSVN (r1183263)
* fix backward compat crashes in JavaHL (r1183054, -347)
* fill in repos_* fields of svn_wc_status3_t for repos-only nodes (r1181609)
-   * disable the sqlite shared process cache (r1185242, r1185280)
+   * disable the SQLite shared process cache (r1185242, r1185280)
 
 
 Version 1.7.0

Re: svn commit: r1186144 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_fs_fs/fs_fs.c

[Daniel Shahaf]

People who are bitten by this will not be able to commit anything with
this revision applied.  Should we add a way to turn off the new
validation?

For svn.a.o I'll just patch it locally, but I suppose not everyone who
runs servers also compiles them from source...

hwri...@apache.org wrote on Wed, Oct 19, 2011 at 12:14:42 -:
 Author: hwright
 Date: Wed Oct 19 12:14:42 2011
 New Revision: 1186144
 
 URL: http://svn.apache.org/viewvc?rev=1186144view=rev
 Log:
 Merge r1178280, r1178282 from trunk:
 
  * r1178280, r1178282
Add a sanity check to FSFS.
Justification:
  Detects a user-visible corruption seen on svn-master.apache.org.
Votes:
  +1: danielsh, rhuijben, stsp
 
 Modified:
 subversion/branches/1.7.x/   (props changed)
 subversion/branches/1.7.x/STATUS
 subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c
 
 Modified: subversion/branches/1.7.x/STATUS
 URL: 
 http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1186144r1=1186143r2=1186144view=diff
 ==
 --- subversion/branches/1.7.x/STATUS (original)
 +++ subversion/branches/1.7.x/STATUS Wed Oct 19 12:14:42 2011
 @@ -124,10 +124,3 @@ Approved changes:
   fix here than having to fix all clients.
 Votes:
   +1: rhuijben, pburba, stsp
 -
 - * r1178280, r1178282
 -   Add a sanity check to FSFS.
 -   Justification:
 - Detects a user-visible corruption seen on svn-master.apache.org.
 -   Votes:
 - +1: danielsh, rhuijben, stsp
 
 Modified: subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c
 URL: 
 http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1186144r1=1186143r2=1186144view=diff
 ==
 --- subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c (original)
 +++ subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c Wed Oct 19 
 12:14:42 2011
 @@ -5873,6 +5873,29 @@ write_hash_rep(svn_filesize_t *size,
return svn_stream_printf(whb-stream, pool, ENDREP\n);
  }
  
 +/* Sanity check ROOT_NODEREV, a candidate for being the root node-revision
 +   of (not yet committed) revision REV.  Use OCEAN for temporary allocations.
 + */
 +static APR_INLINE svn_error_t *
 +validate_root_noderev(node_revision_t *root_noderev,
 +  svn_revnum_t rev)
 +{
 +  /* Bogosity seen on svn.apache.org; see
 +   http://mid.gmane.org/20111002202833.GA12373@daniel3.local
 +   */
 +  if (root_noderev-predecessor_count != -1
 +   root_noderev-predecessor_count != rev)
 +{
 +  return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
 +   _(predecessor count for 
 + the root node-revision is wrong: 
 + found %d, committing r%ld),
 + root_noderev-predecessor_count, rev);
 +}
 +
 +  return SVN_NO_ERROR;
 +}
 +
  /* Copy a node-revision specified by id ID in fileystem FS from a
 transaction into the proto-rev-file FILE.  Set *NEW_ID_P to a
 pointer to the new node-id which will be allocated in POOL.
 @@ -5890,6 +5913,10 @@ write_hash_rep(svn_filesize_t *size,
 If REPS_TO_CACHE is not NULL, append to it a copy (allocated in
 REPS_POOL) of each data rep that is new in this revision.
  
 +   AT_ROOT is true if the node revision being written is the root
 +   node-revision.  It is only controls additional sanity checking
 +   logic.
 +
 Temporary allocations are also from POOL. */
  static svn_error_t *
  write_final_rev(const svn_fs_id_t **new_id_p,
 @@ -5902,6 +5929,7 @@ write_final_rev(const svn_fs_id_t **new_
  apr_off_t initial_offset,
  apr_array_header_t *reps_to_cache,
  apr_pool_t *reps_pool,
 +svn_boolean_t at_root,
  apr_pool_t *pool)
  {
node_revision_t *noderev;
 @@ -5938,7 +5966,7 @@ write_final_rev(const svn_fs_id_t **new_
svn_pool_clear(subpool);
SVN_ERR(write_final_rev(new_id, file, rev, fs, dirent-id,
start_node_id, start_copy_id, 
 initial_offset,
 -  reps_to_cache, reps_pool,
 +  reps_to_cache, reps_pool, FALSE,
subpool));
if (new_id  (svn_fs_fs__id_rev(new_id) == rev))
  dirent-id = svn_fs_fs__id_copy(new_id, pool);
 @@ -6036,6 +6064,8 @@ write_final_rev(const svn_fs_id_t **new_
noderev-id = new_id;
  
/* Write out our new node-revision. */
 +  if (at_root)
 +SVN_ERR(validate_root_noderev(noderev, rev));
SVN_ERR(svn_fs_fs__write_noderev(svn_stream_from_aprfile2(file, TRUE, 
 pool),
 noderev, ffd-format,
 svn_fs_fs__fs_supports_mergeinfo(fs),
 @@ -6315,7 +6345,7 @@ commit_body(void 

svn commit: r1186197 - /subversion/site/publish/docs/release-notes/1.7.html

[stsp]

Author: stsp
Date: Wed Oct 19 13:23:55 2011
New Revision: 1186197

URL: http://svn.apache.org/viewvc?rev=1186197view=rev
Log:
* site/publish/docs/release-notes/1.7.html
  (wc-ng): Explain that corrupt 1.6 working copies cannot be upgraded.

Modified:
subversion/site/publish/docs/release-notes/1.7.html

Modified: subversion/site/publish/docs/release-notes/1.7.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1186197r1=1186196r2=1186197view=diff
==
--- subversion/site/publish/docs/release-notes/1.7.html (original)
+++ subversion/site/publish/docs/release-notes/1.7.html Wed Oct 19 13:23:55 2011
@@ -494,8 +494,13 @@ practical to simply checkout a new worki
 a 1.6 client would have refused to operate upon before an ttsvn cleanup/tt
 was run (with a 1.6 client).  In other words, before upgrading to 1.7, a 1.6
 client must be used to run ttsvn cleanup/tt on all working copies that
-require cleanup.  We regret for this limitation, but we had to introduce it in
-order for 1.7 to ship timely and without overcomplicating the internals./p
+require cleanup.  Likewise, Subversion 1.7 cannot upgrade corrupt 1.6 working
+copies. Unfixsable problems can arise form missing meta-data inside
+tt.svn/tt directories.  Such damage to the 1.6 working copy is permanent,
+and cannot be fixed even if ttsvn cleanup/tt is run prior to the 
upgrade./p
+pWe regret these limitations, but we had to introduce them in order for
+1.7 to ship timely and without overcomplicating the internals.
+If your working copy does not upgrade cleanly, please check out a new one./p
 
 !-- 'sed -ne 5p  .svn/entries' to print `svn info | grep URL` of a 1.4-1.6 
working copy. --
 

svn commit: r1186198 - /subversion/site/publish/docs/release-notes/1.7.html

[stsp]

Author: stsp
Date: Wed Oct 19 13:25:07 2011
New Revision: 1186198

URL: http://svn.apache.org/viewvc?rev=1186198view=rev
Log:
* publish/docs/release-notes/1.7.html: typo

Modified:
subversion/site/publish/docs/release-notes/1.7.html

Modified: subversion/site/publish/docs/release-notes/1.7.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1186198r1=1186197r2=1186198view=diff
==
--- subversion/site/publish/docs/release-notes/1.7.html (original)
+++ subversion/site/publish/docs/release-notes/1.7.html Wed Oct 19 13:25:07 2011
@@ -495,7 +495,7 @@ a 1.6 client would have refused to opera
 was run (with a 1.6 client).  In other words, before upgrading to 1.7, a 1.6
 client must be used to run ttsvn cleanup/tt on all working copies that
 require cleanup.  Likewise, Subversion 1.7 cannot upgrade corrupt 1.6 working
-copies. Unfixsable problems can arise form missing meta-data inside
+copies. Unfixable problems can arise form missing meta-data inside
 tt.svn/tt directories.  Such damage to the 1.6 working copy is permanent,
 and cannot be fixed even if ttsvn cleanup/tt is run prior to the 
upgrade./p
 pWe regret these limitations, but we had to introduce them in order for

svn commit: r1186201 - /subversion/site/publish/docs/release-notes/1.7.html

[stsp]

Author: stsp
Date: Wed Oct 19 13:26:07 2011
New Revision: 1186201

URL: http://svn.apache.org/viewvc?rev=1186201view=rev
Log:
* publish/docs/release-notes/1.7.html: Another typo, wording tweak.

Modified:
subversion/site/publish/docs/release-notes/1.7.html

Modified: subversion/site/publish/docs/release-notes/1.7.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1186201r1=1186200r2=1186201view=diff
==
--- subversion/site/publish/docs/release-notes/1.7.html (original)
+++ subversion/site/publish/docs/release-notes/1.7.html Wed Oct 19 13:26:07 2011
@@ -495,7 +495,7 @@ a 1.6 client would have refused to opera
 was run (with a 1.6 client).  In other words, before upgrading to 1.7, a 1.6
 client must be used to run ttsvn cleanup/tt on all working copies that
 require cleanup.  Likewise, Subversion 1.7 cannot upgrade corrupt 1.6 working
-copies. Unfixable problems can arise form missing meta-data inside
+copies. Unfixable problems can arise from missing or corrupt meta-data inside
 tt.svn/tt directories.  Such damage to the 1.6 working copy is permanent,
 and cannot be fixed even if ttsvn cleanup/tt is run prior to the 
upgrade./p
 pWe regret these limitations, but we had to introduce them in order for

svn commit: r1186202 - /subversion/branches/1.7.x-issue4035/

[philip]

Author: philip
Date: Wed Oct 19 13:26:54 2011
New Revision: 1186202

URL: http://svn.apache.org/viewvc?rev=1186202view=rev
Log:
Create branch for 1.7.x backport of issue 4035 fix.

Added:
subversion/branches/1.7.x-issue4035/   (props changed)
  - copied from r1186201, subversion/branches/1.7.x/

Propchange: subversion/branches/1.7.x-issue4035/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Oct 19 13:26:54 2011
@@ -0,0 +1,2 @@
+[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+
+(\d+)

Propchange: subversion/branches/1.7.x-issue4035/
--
bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID%

Propchange: subversion/branches/1.7.x-issue4035/
--
--- svn:ignore (added)
+++ svn:ignore Wed Oct 19 13:26:54 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/1.7.x-issue4035/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 19 13:26:54 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

svn commit: r1186214 - in /subversion/branches/1.7.x-issue4035: ./ subversion/libsvn_wc/status.c subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h subversion/tests/cmdline/authz_tests.py

[philip]

Author: philip
Date: Wed Oct 19 13:48:27 2011
New Revision: 1186214

URL: http://svn.apache.org/viewvc?rev=1186214view=rev
Log:
Backport r1177732 to 1.7.x and resolve conflicts in status.c and wc_db.h.

Modified:
subversion/branches/1.7.x-issue4035/   (props changed)
subversion/branches/1.7.x-issue4035/subversion/libsvn_wc/status.c
subversion/branches/1.7.x-issue4035/subversion/libsvn_wc/wc_db.c
subversion/branches/1.7.x-issue4035/subversion/libsvn_wc/wc_db.h
subversion/branches/1.7.x-issue4035/subversion/tests/cmdline/authz_tests.py

Propchange: subversion/branches/1.7.x-issue4035/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 13:48:27 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,
 
1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

svn commit: r1186219 - /subversion/branches/showing-merge-info/subversion/include/svn_client.h

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 13:52:31 2011
New Revision: 1186219

URL: http://svn.apache.org/viewvc?rev=1186219view=rev
Log:
On the 'showing-merge-info' branch: Move some declarations.

Modified:
subversion/branches/showing-merge-info/subversion/include/svn_client.h

Modified: subversion/branches/showing-merge-info/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/include/svn_client.h?rev=1186219r1=1186218r2=1186219view=diff
==
--- subversion/branches/showing-merge-info/subversion/include/svn_client.h 
(original)
+++ subversion/branches/showing-merge-info/subversion/include/svn_client.h Wed 
Oct 19 13:52:31 2011
@@ -68,6 +68,63 @@ svn_client_version(void);
  * @{
  */
 
+
+
+/*** Repository and Target location ***/
+
+/* */
+typedef struct svn_client_target_t
+  {
+const char *path_or_url;
+const char *abspath_or_url;
+svn_opt_revision_t peg_revision;
+svn_opt_revision_t revision;
+
+/* The following fields are the resolved location after contacting
+ * the repository, else NULL or SVN_INVALID_REVNUM. */
+const char *repos_root_url;
+const char *repos_uuid;
+const char *repos_relpath;
+svn_revnum_t repos_revnum;
+
+/* The pool in which to allocate new fields */
+apr_pool_t *pool;
+  } svn_client_target_t;
+
+/* Allocate a svn_client_target_t structure. Initialize pool and
+ * abspath_or_url fields. */
+svn_error_t *
+svn_client__target(svn_client_target_t **target,
+   const char *path_or_url,
+   const svn_opt_revision_t *peg_revision,
+   apr_pool_t *pool);
+
+/* Like svn_opt_parse_path(). */
+svn_error_t *
+svn_client__parse_target(svn_client_target_t **target,
+ const char *target_string,
+ apr_pool_t *pool);
+
+/* */
+svn_error_t *
+svn_client__resolve_location(const char **repo_root_url_p,
+ const char **repo_uuid_p,
+ svn_revnum_t *repo_revnum_p,
+ const char **repo_relpath_p,
+ const char *path_or_url,
+ const svn_opt_revision_t *peg_revision,
+ const svn_opt_revision_t *revision,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+/* */
+svn_error_t *
+svn_client__resolve_target_location(svn_client_target_t *target,
+svn_client_ctx_t *ctx,
+apr_pool_t *scratch_pool);
+
+
 
 /*** Authentication stuff ***/
 
@@ -1009,58 +1066,6 @@ svn_client_create_context(svn_client_ctx
  * @{
  */
 
-/* */
-typedef struct svn_client_target_t
-  {
-const char *path_or_url;
-const char *abspath_or_url;
-svn_opt_revision_t peg_revision;
-svn_opt_revision_t revision;
-
-/* The following fields are the resolved location after contacting
- * the repository, else NULL or SVN_INVALID_REVNUM. */
-const char *repos_root_url;
-const char *repos_uuid;
-const char *repos_relpath;
-svn_revnum_t repos_revnum;
-
-/* The pool in which to allocate new fields */
-apr_pool_t *pool;
-  } svn_client_target_t;
-
-/* Allocate a svn_client_target_t structure. Initialize pool and
- * abspath_or_url fields. */
-svn_error_t *
-svn_client__target(svn_client_target_t **target,
-   const char *path_or_url,
-   const svn_opt_revision_t *peg_revision,
-   apr_pool_t *pool);
-
-/* Like svn_opt_parse_path(). */
-svn_error_t *
-svn_client__parse_target(svn_client_target_t **target,
- const char *target_string,
- apr_pool_t *pool);
-
-/* */
-svn_error_t *
-svn_client__resolve_location(const char **repo_root_url_p,
- const char **repo_uuid_p,
- svn_revnum_t *repo_revnum_p,
- const char **repo_relpath_p,
- const char *path_or_url,
- const svn_opt_revision_t *peg_revision,
- const svn_opt_revision_t *revision,
- svn_client_ctx_t *ctx,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/* */
-svn_error_t *
-svn_client__resolve_target_location(svn_client_target_t *target,
-svn_client_ctx_t *ctx,
-apr_pool_t *scratch_pool);
-
 /**
  * Pull remaining target arguments from @a os into @a *targets_p,
  * converting them to UTF-8, followed by targets from @a known_targets

svn commit: r1186223 - /subversion/branches/showing-merge-info/subversion/include/svn_client.h

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 13:59:55 2011
New Revision: 1186223

URL: http://svn.apache.org/viewvc?rev=1186223view=rev
Log:
On the 'showing-merge-info' branch: Move declarations back.

Modified:
subversion/branches/showing-merge-info/subversion/include/svn_client.h

Modified: subversion/branches/showing-merge-info/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/include/svn_client.h?rev=1186223r1=1186222r2=1186223view=diff
==
--- subversion/branches/showing-merge-info/subversion/include/svn_client.h 
(original)
+++ subversion/branches/showing-merge-info/subversion/include/svn_client.h Wed 
Oct 19 13:59:55 2011
@@ -68,63 +68,6 @@ svn_client_version(void);
  * @{
  */
 
-
-
-/*** Repository and Target location ***/
-
-/* */
-typedef struct svn_client_target_t
-  {
-const char *path_or_url;
-const char *abspath_or_url;
-svn_opt_revision_t peg_revision;
-svn_opt_revision_t revision;
-
-/* The following fields are the resolved location after contacting
- * the repository, else NULL or SVN_INVALID_REVNUM. */
-const char *repos_root_url;
-const char *repos_uuid;
-const char *repos_relpath;
-svn_revnum_t repos_revnum;
-
-/* The pool in which to allocate new fields */
-apr_pool_t *pool;
-  } svn_client_target_t;
-
-/* Allocate a svn_client_target_t structure. Initialize pool and
- * abspath_or_url fields. */
-svn_error_t *
-svn_client__target(svn_client_target_t **target,
-   const char *path_or_url,
-   const svn_opt_revision_t *peg_revision,
-   apr_pool_t *pool);
-
-/* Like svn_opt_parse_path(). */
-svn_error_t *
-svn_client__parse_target(svn_client_target_t **target,
- const char *target_string,
- apr_pool_t *pool);
-
-/* */
-svn_error_t *
-svn_client__resolve_location(const char **repo_root_url_p,
- const char **repo_uuid_p,
- svn_revnum_t *repo_revnum_p,
- const char **repo_relpath_p,
- const char *path_or_url,
- const svn_opt_revision_t *peg_revision,
- const svn_opt_revision_t *revision,
- svn_client_ctx_t *ctx,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/* */
-svn_error_t *
-svn_client__resolve_target_location(svn_client_target_t *target,
-svn_client_ctx_t *ctx,
-apr_pool_t *scratch_pool);
-
-
 
 /*** Authentication stuff ***/
 
@@ -1059,6 +1002,64 @@ svn_client_create_context(svn_client_ctx
 #define SVN_CLIENT_AUTH_PASSWORDpassword
 /** @} group end: Authentication information file names */
 
+
+
+/*** Repository and Target location ***/
+
+/* */
+typedef struct svn_client_target_t
+  {
+const char *path_or_url;
+const char *abspath_or_url;
+svn_opt_revision_t peg_revision;
+svn_opt_revision_t revision;
+
+/* The following fields are the resolved location after contacting
+ * the repository, else NULL or SVN_INVALID_REVNUM. */
+const char *repos_root_url;
+const char *repos_uuid;
+const char *repos_relpath;
+svn_revnum_t repos_revnum;
+
+/* The pool in which to allocate new fields */
+apr_pool_t *pool;
+  } svn_client_target_t;
+
+/* Allocate a svn_client_target_t structure. Initialize pool and
+ * abspath_or_url fields. */
+svn_error_t *
+svn_client__target(svn_client_target_t **target,
+   const char *path_or_url,
+   const svn_opt_revision_t *peg_revision,
+   apr_pool_t *pool);
+
+/* Like svn_opt_parse_path(). */
+svn_error_t *
+svn_client__parse_target(svn_client_target_t **target,
+ const char *target_string,
+ apr_pool_t *pool);
+
+/* */
+svn_error_t *
+svn_client__resolve_location(const char **repo_root_url_p,
+ const char **repo_uuid_p,
+ svn_revnum_t *repo_revnum_p,
+ const char **repo_relpath_p,
+ const char *path_or_url,
+ const svn_opt_revision_t *peg_revision,
+ const svn_opt_revision_t *revision,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+/* */
+svn_error_t *
+svn_client__resolve_target_location(svn_client_target_t *target,
+svn_client_ctx_t *ctx,
+apr_pool_t *scratch_pool);
+
+
+
 /** Client argument processing
  *
  * @defgroup clnt_cmdline 

svn commit: r1186224 - /subversion/branches/1.7.x-r1180154/

[pburba]

Author: pburba
Date: Wed Oct 19 14:01:42 2011
New Revision: 1186224

URL: http://svn.apache.org/viewvc?rev=1186224view=rev
Log:
Create a 1.7.x backport branch for the r1180154 group.

Added:
subversion/branches/1.7.x-r1180154/   (props changed)
  - copied from r1186223, subversion/branches/1.7.x/

Propchange: subversion/branches/1.7.x-r1180154/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Oct 19 14:01:42 2011
@@ -0,0 +1,2 @@
+[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+
+(\d+)

Propchange: subversion/branches/1.7.x-r1180154/
--
bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID%

Propchange: subversion/branches/1.7.x-r1180154/
--
--- svn:ignore (added)
+++ svn:ignore Wed Oct 19 14:01:42 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/1.7.x-r1180154/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 19 14:01:42 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

svn commit: r1186229 - in /subversion/branches/1.7.x-issue4035: ./ subversion/libsvn_wc/wc_db.c subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_re

[philip]

Author: philip
Date: Wed Oct 19 14:04:48 2011
New Revision: 1186229

URL: http://svn.apache.org/viewvc?rev=1186229view=rev
Log:
On 1.7.x-issue4035 branch: backport r1186092, r1186101, r1186107
and r1186109.

Added:

subversion/branches/1.7.x-issue4035/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
  - copied unchanged from r1186092, 
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
Modified:
subversion/branches/1.7.x-issue4035/   (props changed)
subversion/branches/1.7.x-issue4035/subversion/libsvn_wc/wc_db.c

subversion/branches/1.7.x-issue4035/subversion/tests/cmdline/upgrade_tests.py

Propchange: subversion/branches/1.7.x-issue4035/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 14:04:48 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1181155,1181609,
 
1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

svn commit: r1186231 - in /subversion/trunk/subversion/libsvn_fs_fs: fs_fs.c tree.c tree.h

[danielsh]

Author: danielsh
Date: Wed Oct 19 14:07:05 2011
New Revision: 1186231

URL: http://svn.apache.org/viewvc?rev=1186231view=rev
Log:
Relax a validation to not break only on new instance of the bug it tests for,
without also croaking on every repository that contains an instance of the bug
somewhere in its history.


First, promote a public API's implementation to be library-scope:

* subversion/libsvn_fs_fs/tree.h
  (svn_fs_fs__node_id): New, implements svn_fs_node_id().

* subversion/libsvn_fs_fs/tree.c
  (fs_node_id): Rename to..
  (svn_fs_fs__node_id): .. this.
  (node_kind, fs_node_origin_rev, root_vtable): Track rename.


Second, relax the validation, using the newly-visible function:

* subversion/libsvn_fs_fs/fs_fs.c
  (validate_root_noderev): Relax validation.
Add FS and POOL parameters.  Drop APR_INLINE marker.
  (write_final_rev):
Update callers.

Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/tree.c
subversion/trunk/subversion/libsvn_fs_fs/tree.h

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1186231r1=1186230r2=1186231view=diff
==
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Oct 19 14:07:05 2011
@@ -5837,17 +5837,50 @@ write_hash_rep(svn_filesize_t *size,
 }
 
 /* Sanity check ROOT_NODEREV, a candidate for being the root node-revision
-   of (not yet committed) revision REV.
+   of (not yet committed) revision REV in FS.  Use POOL for temporary
+   allocations.
  */
-static APR_INLINE svn_error_t *
-validate_root_noderev(node_revision_t *root_noderev,
-  svn_revnum_t rev)
-{
-  /* Bogosity seen on svn.apache.org; see
+static svn_error_t *
+validate_root_noderev(svn_fs_t *fs,
+  node_revision_t *root_noderev,
+  svn_revnum_t rev,
+  apr_pool_t *pool)
+{
+  svn_revnum_t head_revnum = rev-1;
+  int head_predecessor_count;
+
+  SVN_ERR_ASSERT(rev  0);
+
+  /* Compute HEAD_PREDECESSOR_COUNT. */
+  {
+svn_fs_root_t *head_revision;
+const svn_fs_id_t *head_root_id;
+node_revision_t *head_root_noderev;
+
+/* Get /@HEAD's noderev. */
+SVN_ERR(svn_fs_fs__revision_root(head_revision, fs, head_revnum, pool));
+SVN_ERR(svn_fs_fs__node_id(head_root_id, head_revision, /, pool));
+SVN_ERR(svn_fs_fs__get_node_revision(head_root_noderev, fs, head_root_id,
+ pool));
+
+head_predecessor_count = head_root_noderev-predecessor_count;
+  }
+
+  /* Check that the root noderev's predecessor count equals REV.
+
+ This kind of corruption was seen on svn.apache.org (both on
+ the root noderev and on other fspaths' noderevs); see
http://mid.gmane.org/20111002202833.GA12373@daniel3.local
+
+ Normally (rev == root_noderev-predecessor_count), but here we
+ use a more roundabout check that should only trigger on new instances
+ of the corruption, rather then trigger on each and every new commit
+ to a repository that has triggered the bug somewhere in its root
+ noderev's history.
*/
   if (root_noderev-predecessor_count != -1
-   root_noderev-predecessor_count != rev)
+   (root_noderev-predecessor_count - head_predecessor_count)
+ != (rev - head_revnum))
 {
   return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_(predecessor count for 
@@ -6028,7 +6061,7 @@ write_final_rev(const svn_fs_id_t **new_
 
   /* Write out our new node-revision. */
   if (at_root)
-SVN_ERR(validate_root_noderev(noderev, rev));
+SVN_ERR(validate_root_noderev(fs, noderev, rev, pool));
   SVN_ERR(svn_fs_fs__write_noderev(svn_stream_from_aprfile2(file, TRUE, pool),
noderev, ffd-format,
svn_fs_fs__fs_supports_mergeinfo(fs),

Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1186231r1=1186230r2=1186231view=diff
==
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Wed Oct 19 14:07:05 2011
@@ -870,11 +870,11 @@ add_change(svn_fs_t *fs,
 
 /* Get the id of a node referenced by path PATH in ROOT.  Return the
id in *ID_P allocated in POOL. */
-static svn_error_t *
-fs_node_id(const svn_fs_id_t **id_p,
-   svn_fs_root_t *root,
-   const char *path,
-   apr_pool_t *pool)
+svn_error_t *
+svn_fs_fs__node_id(const svn_fs_id_t **id_p,
+   svn_fs_root_t *root,
+   const char *path,
+   apr_pool_t *pool)
 {
   if ((! 

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

[danielsh]

Author: danielsh
Date: Wed Oct 19 14:08:53 2011
New Revision: 1186233

URL: http://svn.apache.org/viewvc?rev=1186233view=rev
Log:
Nominate r1186231.

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=1186233r1=1186232r2=1186233view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 14:08:53 2011
@@ -53,6 +53,14 @@ Candidate changes:
Votes:
  +1: rhuijben, stsp
 
+ * r1186231
+   FSFS: Fix validation so it doesn't hork preexisting repositories that
+   triggered a bug once in their history.
+   Justification:
+ Such repositories are unusable without this revision.
+   Votes:
+ +1: danielsh
+
 Veto-blocked changes:
 =
 

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

[philip]

Author: philip
Date: Wed Oct 19 14:10:20 2011
New Revision: 1186235

URL: http://svn.apache.org/viewvc?rev=1186235view=rev
Log:
* STATUS: Propose issue 4035 fix.

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=1186235r1=1186234r2=1186235view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 14:10:20 2011
@@ -61,6 +61,15 @@ Candidate changes:
Votes:
  +1: danielsh
 
+ * 1177732, r1186092, r1186101, r1186107, r1186109
+   Fix issue 4035.
+   Justification:
+ Lots of user reports of checksum!=NULL assertions.
+   Branch:
+ 1.7.x-issue4035
+   Votes:
+ +1: philip
+
 Veto-blocked changes:
 =
 

svn commit: r1186240 - in /subversion/trunk/subversion/tests/cmdline: authz_tests.py upgrade_tests.py

[philip]

Author: philip
Date: Wed Oct 19 14:34:14 2011
New Revision: 1186240

URL: http://svn.apache.org/viewvc?rev=1186240view=rev
Log:
Move an upgrade that uses authz to authz_tests to avoid spurious
test failures when running the upgrade tests in parallel.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_absent): Remove.
  (test_list): Remove test.

* subversion/tests/cmdline/authz_tests.py
  (): Import helpers.
  (upgrade_absent): Add.
  (test_list): Add test.

Modified:
subversion/trunk/subversion/tests/cmdline/authz_tests.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=1186240r1=1186239r2=1186240view=diff
==
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Wed Oct 19 
14:34:14 2011
@@ -33,6 +33,9 @@ import svntest
 from svntest.main import write_restrictive_svnserve_conf
 from svntest.main import write_authz_file
 from svntest.main import server_authz_has_aliases
+from upgrade_tests import (replace_sbox_with_tarfile,
+   replace_sbox_repo_with_tarfile,
+   wc_is_too_old_regex)
 
 # (abbreviation)
 Item = svntest.wc.StateItem
@@ -1354,6 +1357,41 @@ def wc_commit_error_handling(sbox):
  'ci', wc_dir, '-m', '')
 
 
+@Skip(svntest.main.is_ra_type_file)
+def upgrade_absent(sbox):
+  upgrade absent nodes to server-excluded
+
+  # Install wc and repos
+  replace_sbox_with_tarfile(sbox, 'upgrade_absent.tar.bz2')
+  replace_sbox_repo_with_tarfile(sbox, 'upgrade_absent_repos.tar.bz2')
+
+  # Update config for authz
+  svntest.main.write_restrictive_svnserve_conf(sbox.repo_dir)
+  svntest.main.write_authz_file(sbox, { /  : *=rw,
+/A/B   : *=,
+/A/B/E : jrandom = rw})
+
+  # Attempt to use the working copy, this should give an error
+  expected_stderr = wc_is_too_old_regex
+  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+ 'info', sbox.wc_dir)
+
+  # Now upgrade the working copy
+  svntest.actions.run_and_verify_svn(None, None, [],
+ 'upgrade', sbox.wc_dir)
+
+  # Relocate to allow finding the repository
+  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+ 'svn://127.0.0.1/authz_tests-2',
+ sbox.repo_url, sbox.wc_dir)  
+
+  expected_output = svntest.wc.State(sbox.wc_dir, {
+  })
+
+  # Expect no changes and certainly no errors
+  svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
+None, None)
+
 
 # Run the tests
 
@@ -1382,6 +1420,7 @@ test_list = [ None,
   authz_tree_conflict,
   wc_delete,
   wc_commit_error_handling,
+  upgrade_absent,
  ]
 serial_only = True
 

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186240r1=1186239r2=1186240view=diff
==
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 
14:34:14 2011
@@ -1198,40 +1198,6 @@ def upgrade_file_externals(sbox):
   'alpha' : {'pname3' : 'pvalue3' },
   })
 
-@Skip(svntest.main.is_ra_type_file)
-def upgrade_absent(sbox):
-  upgrade absent nodes to server-excluded
-
-  # Install wc and repos
-  replace_sbox_with_tarfile(sbox, 'upgrade_absent.tar.bz2')
-  replace_sbox_repo_with_tarfile(sbox, 'upgrade_absent_repos.tar.bz2')
-
-  # Update config for authz
-  svntest.main.write_restrictive_svnserve_conf(sbox.repo_dir)
-  svntest.main.write_authz_file(sbox, { /  : *=rw,
-/A/B   : *=,
-/A/B/E : jrandom = rw})
-
-  # Attempt to use the working copy, this should give an error
-  expected_stderr = wc_is_too_old_regex
-  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
- 'info', sbox.wc_dir)
-
-  # Now upgrade the working copy
-  svntest.actions.run_and_verify_svn(None, None, [],
- 'upgrade', sbox.wc_dir)
-
-  # Relocate to allow finding the repository
-  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
- 'svn://127.0.0.1/authz_tests-2',
- 

svn propchange: r1186240 - svn:log

[philip]

Author: philip
Revision: 1186240
Modified property: svn:log

Modified: svn:log at Wed Oct 19 14:35:14 2011
--
--- svn:log (original)
+++ svn:log Wed Oct 19 14:35:14 2011
@@ -1,4 +1,4 @@
-Move an upgrade that uses authz to authz_tests to avoid spurious
+Move an upgrade test that uses authz to authz_tests to avoid spurious
 test failures when running the upgrade tests in parallel.
 
 * subversion/tests/cmdline/upgrade_tests.py

svn commit: r1186244 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/client.h libsvn_client/cmdline.c libsvn_client/merge.c libsvn_client/url.c libsvn_client/util.c

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 14:46:04 2011
New Revision: 1186244

URL: http://svn.apache.org/viewvc?rev=1186244view=rev
Log:
Promote svn_client__get_repos_root() to a public API, deprecating three APIs
that performed subsets of that operation. Calls to the deprecated APIs are
not updated in this commit.

* subversion/libsvn_client/client.h
  (svn_client__get_repos_root): Rename and move to ...

* subversion/include/svn_client.h
  (svn_client_get_repos_root): ... here.
  (svn_client_root_url_from_path, svn_client_uuid_from_url,
   svn_client_uuid_from_path2): Deprecate.

* subversion/libsvn_client/cmdline.c
  (check_root_url_of_target): Track the rename.

* subversion/libsvn_client/merge.c
  (merge_locked, merge_reintegrate_locked, merge_peg_locked): Same.

* subversion/libsvn_client/url.c
  (svn_client_root_url_from_path): Same.

* subversion/libsvn_client/util.c
  (svn_client__get_repos_root): Rename.

Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/cmdline.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/url.c
subversion/trunk/subversion/libsvn_client/util.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1186244r1=1186243r2=1186244view=diff
==
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Oct 19 14:46:04 2011
@@ -5798,12 +5798,36 @@ svn_client_url_from_path(const char **ur
  apr_pool_t *pool);
 
 
+
+/* Fetching a repository's root URL and UUID. */
+
+/** Set @a *repos_root_url and @a *repos_uuid, to the root URL and UUID of
+ * the repository in which @a abspath_or_url is versioned. Use the
+ * authentication baton and working copy context cached in @a ctx as
+ * necessary. @a repos_root_url and/or @a repos_uuid may be NULL if not
+ * wanted.
+ *
+ * Allocate @a *repos_root_url and @a *repos_uuid in @a result_pool.
+ * Use @a scratch_pool for temporary allocations.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_client_get_repos_root(const char **repos_root_url,
+  const char **repos_uuid,
+  const char *abspath_or_url,
+  svn_client_ctx_t *ctx,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool);
+
 /** Set @a *url to the repository root URL of the repository in which
  * @a path_or_url is versioned (or scheduled to be versioned),
  * allocated in @a pool.  @a ctx is required for possible repository
  * authentication.
  *
  * @since New in 1.5.
+ * @deprecated Provided for backward compatibility with the 1.7 API. Use
+ * svn_client_get_repos_root().
  */
 svn_error_t *
 svn_client_root_url_from_path(const char **url,
@@ -5811,16 +5835,15 @@ svn_client_root_url_from_path(const char
   svn_client_ctx_t *ctx,
   apr_pool_t *pool);
 
-
-
-/* Fetching repository UUIDs. */
-
 /** Get repository @a uuid for @a url.
  *
  * Use a @a pool to open a temporary RA session to @a url, discover the
  * repository uuid, and free the session.  Return the uuid in @a uuid,
  * allocated in @a pool.  @a ctx is required for possible repository
  * authentication.
+ *
+ * @deprecated Provided for backward compatibility with the 1.7 API. Use
+ * svn_client_get_repos_root().
  */
 svn_error_t *
 svn_client_uuid_from_url(const char **uuid,
@@ -5836,6 +5859,8 @@ svn_client_uuid_from_url(const char **uu
  * Use @a scratch_pool for temporary allocations.
  *
  * @since New in 1.7.
+ * @deprecated Provided for backward compatibility with the 1.7 API. Use
+ * svn_client_get_repos_root().
  */
 svn_error_t *
 svn_client_uuid_from_path2(const char **uuid,

Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1186244r1=1186243r2=1186244view=diff
==
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Wed Oct 19 14:46:04 2011
@@ -248,21 +248,6 @@ svn_client__ensure_ra_session_url(const 
   const char *session_url,
   apr_pool_t *pool);
 
-/* Set *REPOS_ROOT and *REPOS_UUID, to the URL and UUID that represent
-   the root of the repository in with ABSPATH_OR_URL is versioned.
-   Use the authentication baton and working copy context cached in CTX as
-   necessary.  REPOS_ROOT and/or REPOS_UUID may be NULL if not wanted.
-
-   Allocate *REPOS_ROOT and *REPOS_UUID in RESULT_POOL.
-   Use SCRATCH_POOL for 

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

[philip]

Author: philip
Date: Wed Oct 19 14:54:41 2011
New Revision: 1186250

URL: http://svn.apache.org/viewvc?rev=1186250view=rev
Log:
* STATUS: Propose r1186240, note conflicts

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=1186250r1=1186249r2=1186250view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 14:54:41 2011
@@ -29,7 +29,7 @@ Candidate changes:
Votes:
  +1: stsp
 
- * r1185738, r1185763, r1185768, r1185886
+ * r1185738, r1185763, r1185768, r1185886, r1186240
Add support for upgrading absent nodes to the wonderfull wc-ng world.
Justification:
  This should have been part of 1.7.0. Without this patch it is impossible
@@ -37,8 +37,11 @@ Candidate changes:
Notes:
  r1185738, r1185763, r1185768: adds a test for this problem.
  r1185886: fixes this issue and cleans up whitespace in the test.
+ Merge conflicts with issue r1177732 group.
Votes:
- +1: rhuijben
+ +1: rhuijben (not r1186240)
+ +0: philip (needs r1186240 but there are merge conflicts)
+
 
  * r1185911, r1185918
Fix reporting of depth empty directories
@@ -61,12 +64,14 @@ Candidate changes:
Votes:
  +1: danielsh
 
- * 1177732, r1186092, r1186101, r1186107, r1186109
+ * r1177732, r1186092, r1186101, r1186107, r1186109
Fix issue 4035.
Justification:
  Lots of user reports of checksum!=NULL assertions.
Branch:
  1.7.x-issue4035
+   Notes:
+ Merge conflicts with r1185738 group.
Votes:
  +1: philip
 

svn commit: r1186252 - in /subversion/branches/1.7.x-r1180154: ./ subversion/include/svn_sorts.h subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/libsvn_subr/sorts.c subv

[pburba]

Author: pburba
Date: Wed Oct 19 14:57:54 2011
New Revision: 1186252

URL: http://svn.apache.org/viewvc?rev=1186252view=rev
Log:
On the 1.7.x-r1180154 branch: Merge r1180154 from trunk.

* src-branch-1.7.x
  Mergeinfo change only.

* subversion/include/svn_sorts.h
* subversion/libsvn_client/merge.c
* subversion/libsvn_subr/sorts.c
* subversion/tests/libsvn_subr/mergeinfo-test.c
  Clean merge.

* subversion/libsvn_subr/mergeinfo.c
  Got a lot of conflicts arising from the fact that r1149519 has not been
  backported, nor can it be because it revved svn_rangelist_merge to 
  svn_rangelist_merge2 and added add a scratch pool.  It also claimed to
  modify the rangelist in-place, but it didn't do all it could do on
  that front (hence r1180154).  Since r1180154 is effectively a full-on
  reimplementation of svn_rangelist_merge2 these conflicts don't really
  matter.  The only logical difference from r1180154 is that a local
  subpool is used in in place of svn_rangelist_merge2's scratch_pool.

Modified:
subversion/branches/1.7.x-r1180154/   (props changed)
subversion/branches/1.7.x-r1180154/subversion/include/svn_sorts.h
subversion/branches/1.7.x-r1180154/subversion/libsvn_client/merge.c
subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/mergeinfo.c
subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/sorts.c

subversion/branches/1.7.x-r1180154/subversion/tests/libsvn_subr/mergeinfo-test.c

Propchange: subversion/branches/1.7.x-r1180154/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 14:57:54 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,
 
1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

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

[philip]

Author: philip
Date: Wed Oct 19 15:07:35 2011
New Revision: 1186256

URL: http://svn.apache.org/viewvc?rev=1186256view=rev
Log:
* STATUS: Vote/approve r1185911/r1185918.

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=1186256r1=1186255r2=1186256view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 15:07:35 2011
@@ -42,20 +42,6 @@ Candidate changes:
  +1: rhuijben (not r1186240)
  +0: philip (needs r1186240 but there are merge conflicts)
 
-
- * r1185911, r1185918
-   Fix reporting of depth empty directories
-   Justification:
- Without this patch 'svn update' sometimes tries to apply updates to nodes
- that don't exist locally.
- (1.6 received the same nodes but filtered the incoming data before
-  applying it to the working copy)
-   Notes:
- r1185911 adds a simple test for this case and r1185918 resolves this
- regression.
-   Votes:
- +1: rhuijben, stsp
-
  * r1186231
FSFS: Fix validation so it doesn't hork preexisting repositories that
triggered a bug once in their history.
@@ -99,3 +85,16 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1185911, r1185918
+   Fix reporting of depth empty directories
+   Justification:
+ Without this patch 'svn update' sometimes tries to apply updates to nodes
+ that don't exist locally.
+ (1.6 received the same nodes but filtered the incoming data before
+  applying it to the working copy)
+   Notes:
+ r1185911 adds a simple test for this case and r1185918 resolves this
+ regression.
+   Votes:
+ +1: rhuijben, stsp, philip

svn commit: r1186259 - in /subversion/branches/1.7.x-r1180154: ./ subversion/include/svn_sorts.h subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/libsvn_subr/sorts.c subv

[pburba]

Author: pburba
Date: Wed Oct 19 15:10:59 2011
New Revision: 1186259

URL: http://svn.apache.org/viewvc?rev=1186259view=rev
Log:
On the 1.7.x-r1180154 branch: Merge r1181090, r1181110, and r1181215 from
trunk -- No conflicts.

Modified:
subversion/branches/1.7.x-r1180154/   (props changed)
subversion/branches/1.7.x-r1180154/subversion/include/svn_sorts.h
subversion/branches/1.7.x-r1180154/subversion/libsvn_client/merge.c
subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/mergeinfo.c
subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/sorts.c

subversion/branches/1.7.x-r1180154/subversion/tests/libsvn_subr/mergeinfo-test.c

Propchange: subversion/branches/1.7.x-r1180154/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 15:10: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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1180154,1181155,1181609,
 
1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

svn commit: r1186261 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/adm_crawler.c subversion/tests/cmdline/depth_tests.py

[hwright]

Author: hwright
Date: Wed Oct 19 15:13:47 2011
New Revision: 1186261

URL: http://svn.apache.org/viewvc?rev=1186261view=rev
Log:
Merge r1185911, r1185918 from trunk:

 * r1185911, r1185918
   Fix reporting of depth empty directories
   Justification:
 Without this patch 'svn update' sometimes tries to apply updates to nodes
 that don't exist locally.
 (1.6 received the same nodes but filtered the incoming data before
  applying it to the working copy)
   Notes:
 r1185911 adds a simple test for this case and r1185918 resolves this
 regression.
   Votes:
 +1: rhuijben, stsp, philip

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/adm_crawler.c
subversion/branches/1.7.x/subversion/tests/cmdline/depth_tests.py

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 15:13:47 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,
 
1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

svn commit: r1186267 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/cmdline.c libsvn_client/copy.c libsvn_client/deprecated.c libsvn_client/merge.c libsvn_client/ra.c libsvn_cli

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 15:26:34 2011
New Revision: 1186267

URL: http://svn.apache.org/viewvc?rev=1186267view=rev
Log:
Update calls to three deprecated APIs to use svn_client_get_repos_root()
instead, mark the deprecated APIs as such and move their implementations to
'deprecated.c'. A follow-up to r1186244.

* subversion/include/svn_client.h
  (svn_client_get_repos_root): Mention that it may open a temporary RA
session.
  (svn_client_root_url_from_path, svn_client_uuid_from_url,
   svn_client_uuid_from_path2): Mark as deprecated.

* subversion/libsvn_client/ra.c
  (svn_client_uuid_from_url, svn_client_uuid_from_path2): Move these ...

* subversion/libsvn_client/url.c
  (svn_client_root_url_from_path): ... and this ...

* subversion/libsvn_client/deprecated.c
  (svn_client_uuid_from_url, svn_client_uuid_from_path2,
   svn_client_root_url_from_path): ... to here.

* subversion/libsvn_client/cmdline.c
  (svn_client_args_to_target_array2): Update calls.

* subversion/libsvn_client/copy.c
  (repos_to_wc_copy_locked): Update calls.

* subversion/libsvn_client/merge.c
  (merge_cousins_and_supplement_mergeinfo): Update calls.

* subversion/libsvn_client/relocate.c
  (relocate_externals, svn_client_relocate2): Update calls.

Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/cmdline.c
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/ra.c
subversion/trunk/subversion/libsvn_client/relocate.c
subversion/trunk/subversion/libsvn_client/url.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1186267r1=1186266r2=1186267view=diff
==
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Oct 19 15:26:34 2011
@@ -5807,6 +5807,9 @@ svn_client_url_from_path(const char **ur
  * necessary. @a repos_root_url and/or @a repos_uuid may be NULL if not
  * wanted.
  *
+ * This function will open a temporary RA session to the repository if
+ * necessary to get the information.
+ *
  * Allocate @a *repos_root_url and @a *repos_uuid in @a result_pool.
  * Use @a scratch_pool for temporary allocations.
  *
@@ -5827,8 +5830,9 @@ svn_client_get_repos_root(const char **r
  *
  * @since New in 1.5.
  * @deprecated Provided for backward compatibility with the 1.7 API. Use
- * svn_client_get_repos_root().
+ * svn_client_get_repos_root() instead, with an absolute path.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_root_url_from_path(const char **url,
   const char *path_or_url,
@@ -5843,8 +5847,9 @@ svn_client_root_url_from_path(const char
  * authentication.
  *
  * @deprecated Provided for backward compatibility with the 1.7 API. Use
- * svn_client_get_repos_root().
+ * svn_client_get_repos_root() instead.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_uuid_from_url(const char **uuid,
  const char *url,
@@ -5860,8 +5865,9 @@ svn_client_uuid_from_url(const char **uu
  *
  * @since New in 1.7.
  * @deprecated Provided for backward compatibility with the 1.7 API. Use
- * svn_client_get_repos_root().
+ * svn_client_get_repos_root() instead.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_uuid_from_path2(const char **uuid,
const char *local_abspath,

Modified: subversion/trunk/subversion/libsvn_client/cmdline.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cmdline.c?rev=1186267r1=1186266r2=1186267view=diff
==
--- subversion/trunk/subversion/libsvn_client/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_client/cmdline.c Wed Oct 19 15:26:34 2011
@@ -347,7 +347,11 @@ svn_client_args_to_target_array2(apr_arr
*/
   if (root_url == NULL)
 {
-  err = svn_client_root_url_from_path(root_url, , ctx, pool);
+  const char *current_abspath;
+
+  SVN_ERR(svn_dirent_get_absolute(current_abspath, , pool));
+  err = svn_client_get_repos_root(root_url, NULL /* uuid */,
+  current_abspath, ctx, pool, pool);
   if (err || root_url == NULL)
 return svn_error_create(SVN_ERR_WC_NOT_WORKING_COPY, err,
 _(Resolving '^/': no repository root 

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1186267r1=1186266r2=1186267view=diff
==
--- subversion/trunk/subversion/libsvn_client/copy.c 

svn commit: r1186278 - /subversion/trunk/subversion/libsvn_client/relocate.c

[julianfoad]

Author: julianfoad
Date: Wed Oct 19 15:39:40 2011
New Revision: 1186278

URL: http://svn.apache.org/viewvc?rev=1186278view=rev
Log:
* subversion/libsvn_client/relocate.c
  (relocate_externals): Remove an initialized but unused variable.

Modified:
subversion/trunk/subversion/libsvn_client/relocate.c

Modified: subversion/trunk/subversion/libsvn_client/relocate.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/relocate.c?rev=1186278r1=1186277r2=1186278view=diff
==
--- subversion/trunk/subversion/libsvn_client/relocate.c (original)
+++ subversion/trunk/subversion/libsvn_client/relocate.c Wed Oct 19 15:39:40 
2011
@@ -143,13 +143,9 @@ relocate_externals(const char *local_abs
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
 {
-  const char *url;
   apr_pool_t *iterpool;
   int i;
 
-  SVN_ERR(svn_client_url_from_path2(url, local_abspath, ctx,
-scratch_pool, scratch_pool));
-
   /* Parse an externals definition into an array of external items. */
 
   iterpool = svn_pool_create(scratch_pool);

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

[pburba]

Author: pburba
Date: Wed Oct 19 15:39:56 2011
New Revision: 1186279

URL: http://svn.apache.org/viewvc?rev=1186279view=rev
Log:
* STATUS: Nominate the r1180154 group.

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=1186279r1=1186278r2=1186279view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 15:39:56 2011
@@ -24,6 +24,27 @@ Candidate changes:
  -0: stsp (we can backport these when we need to)
  -0: gstein
 
+ * r1180154, r1181090, r1181110, r1181215
+   Fix svn_rangelist_merge so it allocates new svn_merge_range_t elements
+   only when absolutely necessary.
+   Justification:
+ This addresses a serious inefficiency in memory usage when
+ svn_rangelist_merge (or any of its callers like
+ svn_mergeinfo_catalog_merge and svn_mergeinfo_merge2) are called in
+ a loop.  Prior to this change svn_rangelist_merge2 could potentially
+ reallocate *every* range in both rangelists.  For example, the peak
+ working set memory for the reintegrate merge described in
+ http://svn.haxx.se/dev/archive-2011-09/0254.shtml was 1,324,664 KB
+ with trunk@1179545.  With this group that drops to 26,880 KB.
+   Branch:
+ ^/subversion/branches/1.7.x-r1180154
+   Notes:
+ r1180154 is the primary fix with some new tests.  r1181090 and r1181215
+ is a minor optimization along with more new tests.  r1181110 is just
+ a doc string typo fix.  
+   Votes:
+ +1: pburba
+
  * r1185746, r1186059
Fix up some erroneous Could not frob some targets because... warnings.
Votes:

svn commit: r1186283 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[hwright]

Author: hwright
Date: Wed Oct 19 15:49:49 2011
New Revision: 1186283

URL: http://svn.apache.org/viewvc?rev=1186283view=rev
Log:
No functional change.

* subversion/libsvn_fs_fs/fs_fs.c
  (set_revision_proplist): Remove a unneeded if-statement, and a superfluous
return statement.

Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1186283r1=1186282r2=1186283view=diff
==
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Oct 19 15:49:49 2011
@@ -2905,32 +2905,29 @@ set_revision_proplist(svn_fs_t *fs,
   apr_hash_t *proplist,
   apr_pool_t *pool)
 {
+  const char *final_path;
+  const char *tmp_path;
+  const char *perms_reference;
+  svn_stream_t *stream;
+
   SVN_ERR(ensure_revision_exists(fs, rev, pool));
 
-  if (1)
-{
-  const char *final_path = path_revprops(fs, rev, pool);
-  const char *tmp_path;
-  const char *perms_reference;
-  svn_stream_t *stream;
-
-  /* ### do we have a directory sitting around already? we really shouldn't
- ### have to get the dirname here. */
-  SVN_ERR(svn_stream_open_unique(stream, tmp_path,
- svn_dirent_dirname(final_path, pool),
- svn_io_file_del_none, pool, pool));
-  SVN_ERR(svn_hash_write2(proplist, stream, SVN_HASH_TERMINATOR, pool));
-  SVN_ERR(svn_stream_close(stream));
+  final_path = path_revprops(fs, rev, pool);
 
-  /* We use the rev file of this revision as the perms reference,
- because when setting revprops for the first time, the revprop
- file won't exist and therefore can't serve as its own reference.
- (Whereas the rev file should already exist at this point.) */
-  SVN_ERR(svn_fs_fs__path_rev_absolute(perms_reference, fs, rev, pool));
-  SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
+  /* ### do we have a directory sitting around already? we really shouldn't
+ ### have to get the dirname here. */
+  SVN_ERR(svn_stream_open_unique(stream, tmp_path,
+ svn_dirent_dirname(final_path, pool),
+ svn_io_file_del_none, pool, pool));
+  SVN_ERR(svn_hash_write2(proplist, stream, SVN_HASH_TERMINATOR, pool));
+  SVN_ERR(svn_stream_close(stream));
 
-  return SVN_NO_ERROR;
-}
+  /* We use the rev file of this revision as the perms reference,
+ because when setting revprops for the first time, the revprop
+ file won't exist and therefore can't serve as its own reference.
+ (Whereas the rev file should already exist at this point.) */
+  SVN_ERR(svn_fs_fs__path_rev_absolute(perms_reference, fs, rev, pool));
+  SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
 
   return SVN_NO_ERROR;
 }

svn commit: r1186284 - /subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c

[hwright]

Author: hwright
Date: Wed Oct 19 15:50:15 2011
New Revision: 1186284

URL: http://svn.apache.org/viewvc?rev=1186284view=rev
Log:
* subversion/libsvn_repos/load-fs-vtable.c
  (renumber_mergeinfo_revs): Use svn_mergeinfo_merge2().

Modified:
subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c

Modified: subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c?rev=1186284r1=1186283r2=1186284view=diff
==
--- subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c Wed Oct 19 
15:50:15 2011
@@ -320,8 +320,8 @@ renumber_mergeinfo_revs(svn_string_t **f
 }
 
   if (predates_stream_mergeinfo)
-  SVN_ERR(svn_mergeinfo_merge(final_mergeinfo, predates_stream_mergeinfo,
-  subpool));
+  SVN_ERR(svn_mergeinfo_merge2(final_mergeinfo, predates_stream_mergeinfo,
+   subpool, subpool));
 
   SVN_ERR(svn_mergeinfo_sort(final_mergeinfo, subpool));
 

svn commit: r1186290 - /subversion/branches/moves-scan-log/

[stsp]

Author: stsp
Date: Wed Oct 19 16:03:11 2011
New Revision: 1186290

URL: http://svn.apache.org/viewvc?rev=1186290view=rev
Log:
Add a branch to experiment with heuristics for detecting server-side moves
on the client side by scanning the revision log (i.e. svn log -v output).
Not sure if this will get anywhere yet.

Added:
subversion/branches/moves-scan-log/   (props changed)
  - copied from r1186287, subversion/trunk/

Propchange: subversion/branches/moves-scan-log/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Oct 19 16:03:11 2011
@@ -0,0 +1,2 @@
+[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+
+(\d+)

Propchange: subversion/branches/moves-scan-log/
--
bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID%

Propchange: subversion/branches/moves-scan-log/
--
--- svn:ignore (added)
+++ svn:ignore Wed Oct 19 16:03:11 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/moves-scan-log/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 19 16:03:11 2011
@@ -0,0 +1,58 @@
+/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

svn commit: r1186293 - /subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

[stsp]

Author: stsp
Date: Wed Oct 19 16:06:59 2011
New Revision: 1186293

URL: http://svn.apache.org/viewvc?rev=1186293view=rev
Log:
On the moves-scan-log branch, add a simple heuristic that allows 'svn update'
to obtain information about server-side moves from the revision log.
Work in progress, review if you're interested, else ignore.

* subversion/libsvn_client/update.c
  (scan_moves_log_recevier, scan_moves_log_receiver_baton): New.
  (scan_for_server_side_moves): New helper function that scans the
   revision log for server-side moves before running the update.
   Currently prints results it finds via SVN_DBG, but nothing uses them.
  (update_internal): Call scan_for_server_side_moves().

Modified:
subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

Modified: subversion/branches/moves-scan-log/subversion/libsvn_client/update.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_client/update.c?rev=1186293r1=1186292r2=1186293view=diff
==
--- subversion/branches/moves-scan-log/subversion/libsvn_client/update.c 
(original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_client/update.c Wed 
Oct 19 16:06:59 2011
@@ -160,6 +160,169 @@ is_empty_wc(svn_boolean_t *clean_checkou
   return svn_io_dir_close(dir);
 }
 
+struct scan_moves_log_receiver_baton {
+  /* The moved nodes hash to be populated.
+   * Maps moved-from path to moved-to path. */
+  apr_hash_t *moved_nodes;
+} scan_moves_log_receiver_baton;
+
+static svn_error_t *
+scan_moves_log_recevier(void *baton,
+svn_log_entry_t *log_entry,
+apr_pool_t *scratch_pool)
+{
+  apr_hash_index_t *hi;
+  apr_hash_t *copied_paths = apr_hash_make(scratch_pool); /* copyfrom-path */
+  apr_array_header_t *deleted_paths = apr_array_make(scratch_pool, 0,
+ sizeof(const char *));
+  struct scan_moves_log_receiver_baton *b = baton;
+  int i;
+
+  /* Scan for copied and deleted nodes in this revision. */
+  for (hi = apr_hash_first(scratch_pool, log_entry-changed_paths2);
+   hi; hi = apr_hash_next(hi))
+{
+  const char *path = svn__apr_hash_index_key(hi);
+  svn_log_changed_path2_t *data = svn__apr_hash_index_val(hi);
+
+  if (data-action == 'A'  data-copyfrom_path)
+{
+  if (apr_hash_get(copied_paths, data-copyfrom_path,
+   APR_HASH_KEY_STRING))
+{
+  /* The same copyfrom path appears multiple times. In this
+   * limited and simplified client-side heuristic, this means
+   * that the node was not moved.
+   * Mark this entry as invalid by setting the value to .
+   * ### Extend this check to ignore copies crossing branch-roots?
+   */
+  apr_hash_set(copied_paths, data-copyfrom_path,
+   APR_HASH_KEY_STRING, );
+}
+  else
+apr_hash_set(copied_paths, data-copyfrom_path,
+ APR_HASH_KEY_STRING, path);
+}
+  else if (data-action == 'D')
+APR_ARRAY_PUSH(deleted_paths, const char *) = path;
+}
+
+  /* If a node was deleted at one location and copied from the deleted
+   * location to a new location within the same revision, put the node
+   * on the moved-nodes list. */
+  for (i = 0; i  deleted_paths-nelts; i++)
+{
+  const char *deleted_path = APR_ARRAY_IDX(deleted_paths, i, const char *);
+  const char *copied_path = apr_hash_get(copied_paths, deleted_path,
+ APR_HASH_KEY_STRING);
+  if (copied_path  copied_path[0] != '\0')
+{
+  apr_hash_index_t *hi2;
+  svn_boolean_t first_move = TRUE;
+
+  /* We found a single deleted node which matches the copyfrom
+   * of single a copied node. This is a non-ambiguous move.
+   * In case we previously found a move of the same node,
+   * update the existing entry to point to the node's current
+   * location. */
+  for (hi2 = apr_hash_first(scratch_pool, b-moved_nodes);
+   hi2; hi2 = apr_hash_next(hi2))
+{
+  const char *moved_from = svn__apr_hash_index_key(hi2);
+  const char *moved_to = svn__apr_hash_index_key(hi2);
+
+  if (strcmp(moved_to, deleted_path))
+{
+  first_move = FALSE;
+  apr_hash_set(b-moved_nodes, moved_from,
+   APR_HASH_KEY_STRING,
+   apr_pstrdup(apr_hash_pool_get(b-moved_nodes),
+   copied_path));
+}
+}
+
+  /* If we haven't seen this node being moved before, add it. */
+  if (first_move)
+apr_hash_set(b-moved_nodes,
+

Re: svn commit: r1186290 - /subversion/branches/moves-scan-log/

[Hyrum K Wright]

On Wed, Oct 19, 2011 at 11:03 AM,  s...@apache.org wrote:
 Author: stsp
 Date: Wed Oct 19 16:03:11 2011
 New Revision: 1186290

 URL: http://svn.apache.org/viewvc?rev=1186290view=rev
 Log:
 Add a branch to experiment with heuristics for detecting server-side moves
 on the client side by scanning the revision log (i.e. svn log -v output).
 Not sure if this will get anywhere yet.

BRANCH-README?

-Hyrum


-- 

uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/

svn commit: r1186316 - /subversion/branches/1.7.x-issue4035-r1185738/

[philip]

Author: philip
Date: Wed Oct 19 16:43:14 2011
New Revision: 1186316

URL: http://svn.apache.org/viewvc?rev=1186316view=rev
Log:
Create branch to resolve 1.7.x issue 4035 and r1185738 group conflict

Added:
subversion/branches/1.7.x-issue4035-r1185738/   (props changed)
  - copied from r1186315, subversion/branches/1.7.x-issue4035/

Propchange: subversion/branches/1.7.x-issue4035-r1185738/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Oct 19 16:43:14 2011
@@ -0,0 +1,2 @@
+[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+
+(\d+)

Propchange: subversion/branches/1.7.x-issue4035-r1185738/
--
bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID%

Propchange: subversion/branches/1.7.x-issue4035-r1185738/
--
--- svn:ignore (added)
+++ svn:ignore Wed Oct 19 16:43:14 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/1.7.x-issue4035-r1185738/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 19 16:43:14 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

svn commit: r1186320 - in /subversion/branches/1.7.x-issue4035-r1185738: ./ subversion/tests/cmdline/ subversion/tests/cmdline/upgrade_tests_data/

[philip]

Author: philip
Date: Wed Oct 19 16:47:50 2011
New Revision: 1186320

URL: http://svn.apache.org/viewvc?rev=1186320view=rev
Log:
On 1.7.x-issue4035-r1185738 branch: merge r1185738 and r1185763 and resolve
conflicts in upgrade_tests.py.

Added:

subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent.tar.bz2
  - copied unchanged from r1185738, 
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent.tar.bz2

subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent_repos.tar.bz2
  - copied unchanged from r1185738, 
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent_repos.tar.bz2
Modified:
subversion/branches/1.7.x-issue4035-r1185738/   (props changed)

subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests.py

Propchange: subversion/branches/1.7.x-issue4035-r1185738/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 16:47:50 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1181155,1181609,
 
1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1186092,1186101,1186107,1186109
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

svn commit: r1186322 - in /subversion/branches/1.7.x-issue4035-r1185738: ./ subversion/libsvn_wc/entries.c subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/upgrade_tests.py

[philip]

Author: philip
Date: Wed Oct 19 16:50:20 2011
New Revision: 1186322

URL: http://svn.apache.org/viewvc?rev=1186322view=rev
Log:
On 1.7.x-issue4035-r1185738 branch: merge r1185768, r1185886 and r1186240.

Modified:
subversion/branches/1.7.x-issue4035-r1185738/   (props changed)
subversion/branches/1.7.x-issue4035-r1185738/subversion/libsvn_wc/entries.c

subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/authz_tests.py

subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests.py

Propchange: subversion/branches/1.7.x-issue4035-r1185738/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 16:50:20 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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1181155,1181609,
 
1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185763,1186092,1186101,1186107,1186109
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

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

[philip]

Author: philip
Date: Wed Oct 19 16:54:28 2011
New Revision: 1186328

URL: http://svn.apache.org/viewvc?rev=1186328view=rev
Log:
* STATUS: Add branch and vote

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=1186328r1=1186327r2=1186328view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 16:54:28 2011
@@ -58,10 +58,12 @@ Candidate changes:
Notes:
  r1185738, r1185763, r1185768: adds a test for this problem.
  r1185886: fixes this issue and cleans up whitespace in the test.
- Merge conflicts with issue r1177732 group.
+ Merge conflicts with issue r1177732 group.  Branch includes both sets.
+   Branch:
+ 1.7.x-issue4035-r1185738
Votes:
  +1: rhuijben (not r1186240)
- +0: philip (needs r1186240 but there are merge conflicts)
+ +1: philip
 
  * r1186231
FSFS: Fix validation so it doesn't hork preexisting repositories that

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

[rhuijben]

Author: rhuijben
Date: Wed Oct 19 17:02:40 2011
New Revision: 1186338

URL: http://svn.apache.org/viewvc?rev=1186338view=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=1186338r1=1186337r2=1186338view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 17:02:40 2011
@@ -43,7 +43,7 @@ Candidate changes:
  is a minor optimization along with more new tests.  r1181110 is just
  a doc string typo fix.  
Votes:
- +1: pburba
+ +1: pburba, rhuijben
 
  * r1185746, r1186059
Fix up some erroneous Could not frob some targets because... warnings.
@@ -60,10 +60,9 @@ Candidate changes:
  r1185886: fixes this issue and cleans up whitespace in the test.
  Merge conflicts with issue r1177732 group.  Branch includes both sets.
Branch:
- 1.7.x-issue4035-r1185738
+ ^/subversion/branches/1.7.x-issue4035-r1185738
Votes:
- +1: rhuijben (not r1186240)
- +1: philip
+ +1: rhuijben, philip
 
  * r1186231
FSFS: Fix validation so it doesn't hork preexisting repositories that
@@ -78,11 +77,11 @@ Candidate changes:
Justification:
  Lots of user reports of checksum!=NULL assertions.
Branch:
- 1.7.x-issue4035
+ ^/subversion/branches/1.7.x-issue4035
Notes:
  Merge conflicts with r1185738 group.
Votes:
- +1: philip
+ +1: philip, rhuijben
 
 Veto-blocked changes:
 =

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

[danielsh]

Author: danielsh
Date: Wed Oct 19 17:11:19 2011
New Revision: 1186345

URL: http://svn.apache.org/viewvc?rev=1186345view=rev
Log:
Add a trivial change to avoid merge conflicts.

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=1186345r1=1186344r2=1186345view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 17:11:19 2011
@@ -64,7 +64,7 @@ Candidate changes:
Votes:
  +1: rhuijben, philip
 
- * r1186231
+ * r1186121, r1186231
FSFS: Fix validation so it doesn't hork preexisting repositories that
triggered a bug once in their history.
Justification:

svn commit: r1186352 - in /subversion/branches/1.7.x: ./ STATUS subversion/include/svn_sorts.h subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/libsvn_subr/sorts.c subver

[hwright]

Author: hwright
Date: Wed Oct 19 17:19:15 2011
New Revision: 1186352

URL: http://svn.apache.org/viewvc?rev=1186352view=rev
Log:
Reintegrate the 1.7.x-r1180514 branch:

 * r1180154, r1181090, r1181110, r1181215
   Fix svn_rangelist_merge so it allocates new svn_merge_range_t elements
   only when absolutely necessary.
   Justification:
 This addresses a serious inefficiency in memory usage when
 svn_rangelist_merge (or any of its callers like
 svn_mergeinfo_catalog_merge and svn_mergeinfo_merge2) are called in
 a loop.  Prior to this change svn_rangelist_merge2 could potentially
 reallocate *every* range in both rangelists.  For example, the peak
 working set memory for the reintegrate merge described in
 http://svn.haxx.se/dev/archive-2011-09/0254.shtml was 1,324,664 KB
 with trunk@1179545.  With this group that drops to 26,880 KB.
   Branch:
 ^/subversion/branches/1.7.x-r1180154
   Notes:
 r1180154 is the primary fix with some new tests.  r1181090 and r1181215
 is a minor optimization along with more new tests.  r1181110 is just
 a doc string typo fix.  
   Votes:
 +1: pburba, rhuijben, stsp

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/include/svn_sorts.h
subversion/branches/1.7.x/subversion/libsvn_client/merge.c
subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c
subversion/branches/1.7.x/subversion/libsvn_subr/sorts.c
subversion/branches/1.7.x/subversion/tests/libsvn_subr/mergeinfo-test.c

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 17:19:15 2011
@@ -10,6 +10,7 @@
 /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/1.7.x-r1180154:1186224-1186351
 /subversion/branches/atomic-revprop:965046-1000689
 /subversion/branches/bdb-reverse-deltas:872050-872529
 /subversion/branches/diff-callbacks3:870059-870761
@@ -64,4 +65,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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,
 
1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185911,1185918

svn propchange: r1186231 - svn:log

[danielsh]

Author: danielsh
Revision: 1186231
Modified property: svn:log

Modified: svn:log at Wed Oct 19 17:19:17 2011
--
--- svn:log (original)
+++ svn:log Wed Oct 19 17:19:17 2011
@@ -1,6 +1,6 @@
-Relax a validation to not break only on new instance of the bug it tests for,
-without also croaking on every repository that contains an instance of the bug
-somewhere in its history.
+Relax a validation to trigger only on new instances of the bug it tests for,
+without also croaking on every commit to every repository that contains an
+instance of the bug somewhere in its history.
 
 
 First, promote a public API's implementation to be library-scope:

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

[stsp]

Author: stsp
Date: Wed Oct 19 17:22:16 2011
New Revision: 1186354

URL: http://svn.apache.org/viewvc?rev=1186354view=rev
Log:
* STATUS: Vote for r1186121.

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=1186354r1=1186353r2=1186354view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 17:22:16 2011
@@ -48,8 +48,9 @@ Candidate changes:
triggered a bug once in their history.
Justification:
  Such repositories are unusable without this revision.
+ Either this must be backported to 1.7.1 or r1186144 must be undone.
Votes:
- +1: danielsh
+ +1: danielsh, stsp
 
  * r1177732, r1186092, r1186101, r1186107, r1186109
Fix issue 4035.

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

[philip]

Author: philip
Date: Wed Oct 19 17:24:27 2011
New Revision: 1186358

URL: http://svn.apache.org/viewvc?rev=1186358view=rev
Log:
* STATUS: Vote/approve r1186231

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=1186358r1=1186357r2=1186358view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 17:24:27 2011
@@ -43,15 +43,6 @@ Candidate changes:
Votes:
  +1: rhuijben, philip
 
- * r1186121, r1186231
-   FSFS: Fix validation so it doesn't hork preexisting repositories that
-   triggered a bug once in their history.
-   Justification:
- Such repositories are unusable without this revision.
- Either this must be backported to 1.7.1 or r1186144 must be undone.
-   Votes:
- +1: danielsh, stsp
-
  * r1177732, r1186092, r1186101, r1186107, r1186109
Fix issue 4035.
Justification:
@@ -87,3 +78,12 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1186121, r1186231
+   FSFS: Fix validation so it doesn't hork preexisting repositories that
+   triggered a bug once in their history.
+   Justification:
+ Such repositories are unusable by 1.7.x without this revision.
+ Either this must be backported to 1.7.1 or r1186144 must be undone.
+   Votes:
+ +1: danielsh, stsp, philip

Re: svn commit: r1186283 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[Daniel Shahaf]

Please revert.  The if (1) is there to make merging the revprop-packing
branch easier.

If you don't like the if (1) line, feel free to delete *just that line*
and leave the {} block intact...

hwri...@apache.org wrote on Wed, Oct 19, 2011 at 15:49:49 -:
 Author: hwright
 Date: Wed Oct 19 15:49:49 2011
 New Revision: 1186283
 
 URL: http://svn.apache.org/viewvc?rev=1186283view=rev
 Log:
 No functional change.
 
 * subversion/libsvn_fs_fs/fs_fs.c
   (set_revision_proplist): Remove a unneeded if-statement, and a superfluous
 return statement.
 
 Modified:
 subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
 
 Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
 URL: 
 http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1186283r1=1186282r2=1186283view=diff
 ==
 --- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
 +++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Oct 19 15:49:49 2011
 @@ -2905,32 +2905,29 @@ set_revision_proplist(svn_fs_t *fs,
apr_hash_t *proplist,
apr_pool_t *pool)
  {
 +  const char *final_path;
 +  const char *tmp_path;
 +  const char *perms_reference;
 +  svn_stream_t *stream;
 +
SVN_ERR(ensure_revision_exists(fs, rev, pool));
  
 -  if (1)
 -{
 -  const char *final_path = path_revprops(fs, rev, pool);
 -  const char *tmp_path;
 -  const char *perms_reference;
 -  svn_stream_t *stream;
 -
 -  /* ### do we have a directory sitting around already? we really 
 shouldn't
 - ### have to get the dirname here. */
 -  SVN_ERR(svn_stream_open_unique(stream, tmp_path,
 - svn_dirent_dirname(final_path, pool),
 - svn_io_file_del_none, pool, pool));
 -  SVN_ERR(svn_hash_write2(proplist, stream, SVN_HASH_TERMINATOR, pool));
 -  SVN_ERR(svn_stream_close(stream));
 +  final_path = path_revprops(fs, rev, pool);
  
 -  /* We use the rev file of this revision as the perms reference,
 - because when setting revprops for the first time, the revprop
 - file won't exist and therefore can't serve as its own reference.
 - (Whereas the rev file should already exist at this point.) */
 -  SVN_ERR(svn_fs_fs__path_rev_absolute(perms_reference, fs, rev, pool));
 -  SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
 +  /* ### do we have a directory sitting around already? we really shouldn't
 + ### have to get the dirname here. */
 +  SVN_ERR(svn_stream_open_unique(stream, tmp_path,
 + svn_dirent_dirname(final_path, pool),
 + svn_io_file_del_none, pool, pool));
 +  SVN_ERR(svn_hash_write2(proplist, stream, SVN_HASH_TERMINATOR, pool));
 +  SVN_ERR(svn_stream_close(stream));
  
 -  return SVN_NO_ERROR;
 -}
 +  /* We use the rev file of this revision as the perms reference,
 + because when setting revprops for the first time, the revprop
 + file won't exist and therefore can't serve as its own reference.
 + (Whereas the rev file should already exist at this point.) */
 +  SVN_ERR(svn_fs_fs__path_rev_absolute(perms_reference, fs, rev, pool));
 +  SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
  
return SVN_NO_ERROR;
  }
 
 

svn commit: r1186359 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_fs_fs/fs_fs.c subversion/libsvn_fs_fs/tree.c subversion/libsvn_fs_fs/tree.h

[hwright]

Author: hwright
Date: Wed Oct 19 17:28:55 2011
New Revision: 1186359

URL: http://svn.apache.org/viewvc?rev=1186359view=rev
Log:
Merge r1186121, r1186231 from trunk:

 * r1186121, r1186231
   FSFS: Fix validation so it doesn't hork preexisting repositories that
   triggered a bug once in their history.
   Justification:
 Such repositories are unusable by 1.7.x without this revision.
 Either this must be backported to 1.7.1 or r1186144 must be undone.
   Votes:
 +1: danielsh, stsp, philip

Modified:
subversion/branches/1.7.x/   (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/1.7.x/subversion/libsvn_fs_fs/tree.c
subversion/branches/1.7.x/subversion/libsvn_fs_fs/tree.h

Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 17:28:55 2011
@@ -65,4 +65,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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,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,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1180154,1181090,1181110,
 
1181155,1181215,1181609,1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185911,1185918
+/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,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,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,115
 

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

[hwright]

Author: hwright
Date: Wed Oct 19 17:30:48 2011
New Revision: 1186360

URL: http://svn.apache.org/viewvc?rev=1186360view=rev
Log:
Repair STATUS.

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=1186360r1=1186359r2=1186360view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 17:30:48 2011
@@ -1,4 +1,19 @@
-  '=
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  * *
+  *  THIS RELEASE STREAM IS OPEN TO BUG FIXES.  *
+  * *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+This file tracks the status of releases in the 1.7.x line.
+
+See 
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
+for details on how release lines and voting work, what kinds of bugs can
+delay a release, etc.
+
+Status of 1.7.1:
+
+Candidate changes:
+==
 
  * r1147540, r1147541
Remove unused variables in build system.

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

[stsp]

Author: stsp
Date: Wed Oct 19 17:33:49 2011
New Revision: 1186362

URL: http://svn.apache.org/viewvc?rev=1186362view=rev
Log:
* STATUS: Approve r1185738 group.

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=1186362r1=1186361r2=1186362view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 17:33:49 2011
@@ -29,20 +29,6 @@ Candidate changes:
Votes:
  +1: stsp
 
- * r1185738, r1185763, r1185768, r1185886, r1186240
-   Add support for upgrading absent nodes to the wonderfull wc-ng world.
-   Justification:
- This should have been part of 1.7.0. Without this patch it is impossible
- to upgrade working copies with server excluded/absent directories.
-   Notes:
- r1185738, r1185763, r1185768: adds a test for this problem.
- r1185886: fixes this issue and cleans up whitespace in the test.
- Merge conflicts with issue r1177732 group.  Branch includes both sets.
-   Branch:
- ^/subversion/branches/1.7.x-issue4035-r1185738
-   Votes:
- +1: rhuijben, philip
-
  * r1177732, r1186092, r1186101, r1186107, r1186109
Fix issue 4035.
Justification:
@@ -78,3 +64,17 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1185738, r1185763, r1185768, r1185886, r1186240
+   Add support for upgrading absent nodes to the wonderfull wc-ng world.
+   Justification:
+ This should have been part of 1.7.0. Without this patch it is impossible
+ to upgrade working copies with server excluded/absent directories.
+   Notes:
+ r1185738, r1185763, r1185768: adds a test for this problem.
+ r1185886: fixes this issue and cleans up whitespace in the test.
+ Merge conflicts with issue r1177732 group.  Branch includes both sets.
+   Branch:
+ ^/subversion/branches/1.7.x-issue4035-r1185738
+   Votes:
+ +1: rhuijben, philip, stsp

Re: svn commit: r1186252 - in /subversion/branches/1.7.x-r1180154: ./ subversion/include/svn_sorts.h subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/libsvn_subr/sorts.c

[Daniel Shahaf]

Paul,

pbu...@apache.org wrote on Wed, Oct 19, 2011 at 14:57:54 -:
 Author: pburba
 Date: Wed Oct 19 14:57:54 2011
 New Revision: 1186252
 
 URL: http://svn.apache.org/viewvc?rev=1186252view=rev
 Log:
 On the 1.7.x-r1180154 branch: Merge r1180154 from trunk.
 
 * src-branch-1.7.x
   Mergeinfo change only.
 
 * subversion/include/svn_sorts.h
 * subversion/libsvn_client/merge.c
 * subversion/libsvn_subr/sorts.c
 * subversion/tests/libsvn_subr/mergeinfo-test.c
   Clean merge.
 
 * subversion/libsvn_subr/mergeinfo.c
   Got a lot of conflicts arising from the fact that r1149519 has not been
   backported, nor can it be because it revved svn_rangelist_merge to 
   svn_rangelist_merge2 and added add a scratch pool.  It also claimed to
   modify the rangelist in-place, but it didn't do all it could do on
   that front (hence r1180154).  Since r1180154 is effectively a full-on
   reimplementation of svn_rangelist_merge2 these conflicts don't really
   matter.  The only logical difference from r1180154 is that a local
   subpool is used in in place of svn_rangelist_merge2's scratch_pool.

Could you clarify the last paragraph?  It definitely describes the
history of the change, but I don't see where it answers the question
What happened to mergeinfo.c in r1186252?.

Thanks,

Daniel

svn commit: r1186370 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[hwright]

Author: hwright
Date: Wed Oct 19 18:01:46 2011
New Revision: 1186370

URL: http://svn.apache.org/viewvc?rev=1186370view=rev
Log:
Revert r1186283, per the request of danielsh:
http://svn.haxx.se/dev/archive-2011-10/0287.shtml

Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1186370r1=1186369r2=1186370view=diff
==
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Oct 19 18:01:46 2011
@@ -2905,29 +2905,32 @@ set_revision_proplist(svn_fs_t *fs,
   apr_hash_t *proplist,
   apr_pool_t *pool)
 {
-  const char *final_path;
-  const char *tmp_path;
-  const char *perms_reference;
-  svn_stream_t *stream;
-
   SVN_ERR(ensure_revision_exists(fs, rev, pool));
 
-  final_path = path_revprops(fs, rev, pool);
+  if (1)
+{
+  const char *final_path = path_revprops(fs, rev, pool);
+  const char *tmp_path;
+  const char *perms_reference;
+  svn_stream_t *stream;
+
+  /* ### do we have a directory sitting around already? we really shouldn't
+ ### have to get the dirname here. */
+  SVN_ERR(svn_stream_open_unique(stream, tmp_path,
+ svn_dirent_dirname(final_path, pool),
+ svn_io_file_del_none, pool, pool));
+  SVN_ERR(svn_hash_write2(proplist, stream, SVN_HASH_TERMINATOR, pool));
+  SVN_ERR(svn_stream_close(stream));
 
-  /* ### do we have a directory sitting around already? we really shouldn't
- ### have to get the dirname here. */
-  SVN_ERR(svn_stream_open_unique(stream, tmp_path,
- svn_dirent_dirname(final_path, pool),
- svn_io_file_del_none, pool, pool));
-  SVN_ERR(svn_hash_write2(proplist, stream, SVN_HASH_TERMINATOR, pool));
-  SVN_ERR(svn_stream_close(stream));
+  /* We use the rev file of this revision as the perms reference,
+ because when setting revprops for the first time, the revprop
+ file won't exist and therefore can't serve as its own reference.
+ (Whereas the rev file should already exist at this point.) */
+  SVN_ERR(svn_fs_fs__path_rev_absolute(perms_reference, fs, rev, pool));
+  SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
 
-  /* We use the rev file of this revision as the perms reference,
- because when setting revprops for the first time, the revprop
- file won't exist and therefore can't serve as its own reference.
- (Whereas the rev file should already exist at this point.) */
-  SVN_ERR(svn_fs_fs__path_rev_absolute(perms_reference, fs, rev, pool));
-  SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
+  return SVN_NO_ERROR;
+}
 
   return SVN_NO_ERROR;
 }

svn propchange: r1186283 - svn:log

[hwright]

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

Modified: svn:log at Wed Oct 19 18:02:23 2011
--
--- svn:log (original)
+++ svn:log Wed Oct 19 18:02:23 2011
@@ -1,3 +1,5 @@
+[ Reverted in r1186370. ]
+
 No functional change.
 
 * subversion/libsvn_fs_fs/fs_fs.c

svn commit: r1186376 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[danielsh]

Author: danielsh
Date: Wed Oct 19 18:12:40 2011
New Revision: 1186376

URL: http://svn.apache.org/viewvc?rev=1186376view=rev
Log:
Comment out confusing 'if (1)' placeholder statements.

Suggested by: stsp

* subversion/libsvn_fs_fs/fs_fs.c
  (set_revision_proplist, revision_proplist, commit_body, recover_body):
Replace 'if (1)' with comments explaining the extra {} block.  No functional
change.

Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1186376r1=1186375r2=1186376view=diff
==
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Oct 19 18:12:40 2011
@@ -2907,7 +2907,7 @@ set_revision_proplist(svn_fs_t *fs,
 {
   SVN_ERR(ensure_revision_exists(fs, rev, pool));
 
-  if (1)
+  /* if (1); null condition for easier merging to revprop-packing */
 {
   const char *final_path = path_revprops(fs, rev, pool);
   const char *tmp_path;
@@ -2945,7 +2945,7 @@ revision_proplist(apr_hash_t **proplist_
 
   SVN_ERR(ensure_revision_exists(fs, rev, pool));
 
-  if (1)
+  /* if (1); null condition for easier merging to revprop-packing */
 {
   apr_file_t *revprop_file = NULL;
   svn_error_t *err = SVN_NO_ERROR;
@@ -6387,7 +6387,7 @@ commit_body(void *baton, apr_pool_t *poo
  fails because the shard already existed for some reason. */
   if (ffd-max_files_per_dir  new_rev % ffd-max_files_per_dir == 0)
 {
-  if (1)
+  /* if (1); null condition for easier merging to revprop-packing */
 {
   const char *new_dir = path_rev_shard(cb-fs, new_rev, pool);
   svn_error_t *err = svn_io_dir_make(new_dir, APR_OS_DEFAULT, pool);
@@ -7043,7 +7043,7 @@ recover_body(void *baton, apr_pool_t *po
 youngest_revprops_kind, pool));
   if (youngest_revprops_kind == svn_node_none)
 {
-  if (1)
+  /* if (1); null condition for easier merging to revprop-packing */
 {
   return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_(Revision %ld has a revs file but no 

svn commit: r1186392 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/deprecated.c libsvn_repos/load-fs-vtable.c svnadmin/main.c tests/cmdline/svnadmin_tests.py

[cmpilato]

Author: cmpilato
Date: Wed Oct 19 18:44:36 2011
New Revision: 1186392

URL: http://svn.apache.org/viewvc?rev=1186392view=rev
Log:
Finish issue #3734 ('Add revision-based filtering to the dumpstream
load functionality').  Add support for the --revision (-r) option for
'svnadmin load' to facilitate incremental loads.

* subversion/include/svn_repos.h
  (svn_repos_notify_action_t): Add 'svn_repos_notify_load_skipped_rev'
enum value.
  (svn_repos_load_fs4, svn_repos_get_fs_build_parser4): New versions
of these APIs which add 'start_rev' and 'end_rev' parameters.
  (svn_repos_load_fs3, svn_repos_get_fs_build_parser3): Deprecate.

* subversion/libsvn_repos/load-fs-vtable.c
  (struct parse_baton): Add 'start_rev' and 'end_rev' members.
  (struct revision_baton): Add 'skipped' member.
  (new_revision_record): Don't create a transaction when skipping
revisions, but do notify about the skip.
  (new_node_record, set_revision_property, set_node_property,
delete_node_property, remove_node_props, apply_textdelta,
set_fulltext, close_node, close_revision): Don't make any real FS
changes if we're skipping the current revision.
  (svn_repos_load_fs4): Was svn_repos_load_fs3().  Add 'start_rev' and
'end_rev' parameters.  Update call to svn_repos_get_fs_build_parser4().
  (svn_repos_get_fs_build_parser4): Was svn_repos_get_fs_build_parser3(). 
Add 'start_rev' and 'end_rev' parameters, which are validated and
then stuff into the parse_baton.

* subversion/libsvn_repos/deprecated.c
  (svn_repos_load_fs3): New wrapper around svn_repos_load_fs4().
  (svn_repos_get_fs_build_parser3): New wrapper around
svn_repos_get_fs_build_parser4().

* subversion/svnadmin/main.c
  (cmd_table): Cause the 'load' command to also accept the --revision (-r)
option.
  (repos_notify_handler): Handle the svn_repos_notify_load_skipped_rev
notification, too.
  (optrev_to_revnum): New helper function.
  (subcommand_load): Handle revision options now with an updated call
to svn_fs_load_fs4().

* subversion/tests/cmdline/svnadmin_tests.py
  (load_ranges): New test.
  (test_list): Add reference to new test.

Modified:
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/libsvn_repos/deprecated.c
subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
subversion/trunk/subversion/svnadmin/main.c
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

Modified: subversion/trunk/subversion/include/svn_repos.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1186392r1=1186391r2=1186392view=diff
==
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Wed Oct 19 18:44:36 2011
@@ -242,7 +242,10 @@ typedef enum svn_repos_notify_action_t
   svn_repos_notify_recover_start,
 
   /** Upgrade has started. */
-  svn_repos_notify_upgrade_start
+  svn_repos_notify_upgrade_start,
+
+  /** A revision was skipped during loading. @since New in 1.8. */
+  svn_repos_notify_load_skipped_rev
 
 } svn_repos_notify_action_t;
 
@@ -2547,6 +2550,13 @@ svn_repos_dump_fs(svn_repos_t *repos,
  * If the dumpstream contains no UUID, then @a uuid_action is
  * ignored and the repository UUID is not touched.
  *
+ * @a start_rev and @a end_rev act as filters, the lower and upper
+ * (inclusive) range values of revisions in @a dumpstream which will
+ * be loaded.  Either both of these values are #SVN_INVALID_REVNUM (in
+ * which case no revision-based filtering occurs at all), or both are
+ * valid revisions (where @a start_rev is older than or equivalent to
+ * @a end_rev).
+ *
  * If @a parent_dir is not NULL, then the parser will reparent all the
  * loaded nodes, from root to @a parent_dir.  The directory @a parent_dir
  * must be an existing directory in the repository.
@@ -2568,8 +2578,38 @@ svn_repos_dump_fs(svn_repos_t *repos,
  * @a cancel_baton as argument to see if the client wishes to cancel
  * the load.
  *
+ * @note If @a start_rev and @end_rev are valid revisions, this
+ * function presumes the revisions as numbered in @a dumpstream only
+ * increase from the beginning of the stream to the end.  Gaps in the
+ * number sequence are ignored, but upon finding a revision number
+ * younger than the specified range, this function may stop loading
+ * new revisions regardless of their number.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_repos_load_fs4(svn_repos_t *repos,
+   svn_stream_t *dumpstream,
+   svn_revnum_t start_rev,
+   svn_revnum_t end_rev,
+   enum svn_repos_load_uuid uuid_action,
+   const char *parent_dir,
+   svn_boolean_t use_pre_commit_hook,
+   svn_boolean_t use_post_commit_hook,
+   svn_boolean_t validate_props,
+   svn_repos_notify_func_t 

svn propchange: r1186252 - svn:log

[pburba]

Author: pburba
Revision: 1186252
Modified property: svn:log

Modified: svn:log at Wed Oct 19 18:58:02 2011
--
--- svn:log (original)
+++ svn:log Wed Oct 19 18:58:02 2011
@@ -10,11 +10,18 @@ On the 1.7.x-r1180154 branch: Merge r118
   Clean merge.
 
 * subversion/libsvn_subr/mergeinfo.c
-  Got a lot of conflicts arising from the fact that r1149519 has not been
+  Got a lot of conflicts arising from the fact that r1149519, the only
+  relevant change to mergeinfo.c since we branched 1.7, has not been
   backported, nor can it be because it revved svn_rangelist_merge to 
-  svn_rangelist_merge2 and added add a scratch pool.  It also claimed to
+  svn_rangelist_merge2 adding a scratch pool.  r1149519 also claimed to
   modify the rangelist in-place, but it didn't do all it could do on
   that front (hence r1180154).  Since r1180154 is effectively a full-on
-  reimplementation of svn_rangelist_merge2 these conflicts don't really
-  matter.  The only logical difference from r1180154 is that a local
-  subpool is used in in place of svn_rangelist_merge2's scratch_pool.
+  reimplementation of svn_rangelist_merge2 these conflicts can largely
+  be ignored.  After this commit the only difference between
+  svn_rangelist_merge2's implementation in
+  ^/subversion/trunk/subversion/libsvn_subr/mergeinfo.c@1186252
+  svn_rangelist_merge's implementation in
+  ^/subversion/branches/1.7.x-1180154/subversion/libsvn_subr/mergeinfo.c
+  @1186252 is that the latter uses a local subpool in place of a
+  passed-in scratch and takes apr_array_header_t **rangelist argument
+  rather than a apr_array_header_t *rangelist.

Re: svn commit: r1186252 - in /subversion/branches/1.7.x-r1180154: ./ subversion/include/svn_sorts.h subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/libsvn_subr/sorts.c

[Paul Burba]

On Wed, Oct 19, 2011 at 1:33 PM, Daniel Shahaf d...@daniel.shahaf.name wrote:
 Paul,

 pbu...@apache.org wrote on Wed, Oct 19, 2011 at 14:57:54 -:
 Author: pburba
 Date: Wed Oct 19 14:57:54 2011
 New Revision: 1186252

 URL: http://svn.apache.org/viewvc?rev=1186252view=rev
 Log:
 On the 1.7.x-r1180154 branch: Merge r1180154 from trunk.

 * src-branch-1.7.x
   Mergeinfo change only.

 * subversion/include/svn_sorts.h
 * subversion/libsvn_client/merge.c
 * subversion/libsvn_subr/sorts.c
 * subversion/tests/libsvn_subr/mergeinfo-test.c
   Clean merge.

 * subversion/libsvn_subr/mergeinfo.c
   Got a lot of conflicts arising from the fact that r1149519 has not been
   backported, nor can it be because it revved svn_rangelist_merge to
   svn_rangelist_merge2 and added add a scratch pool.  It also claimed to
   modify the rangelist in-place, but it didn't do all it could do on
   that front (hence r1180154).  Since r1180154 is effectively a full-on
   reimplementation of svn_rangelist_merge2 these conflicts don't really
   matter.  The only logical difference from r1180154 is that a local
   subpool is used in in place of svn_rangelist_merge2's scratch_pool.

 Could you clarify the last paragraph?  It definitely describes the
 history of the change, but I don't see where it answers the question
 What happened to mergeinfo.c in r1186252?.

Hi Daniel,

It may be a moot point now, since this has already been backported,
but I adjusted the log message to better explain what I meant:
http://svn.apache.org/viewvc?view=revisionrevision=1186252

Hopefully that clears things up, let me know if you still have any concerns.

Paul

 Thanks,

 Daniel

svn commit: r1186434 - in /subversion/trunk/subversion: libsvn_wc/entries.c tests/cmdline/upgrade_tests.py

[philip]

Author: philip
Date: Wed Oct 19 19:55:30 2011
New Revision: 1186434

URL: http://svn.apache.org/viewvc?rev=1186434view=rev
Log:
Fix issue 4033, upgrade with not-present replaced nodes.  This fixes
the case identified in the issue but there may still be problems if the
not-present node is a working node.

* subversion/libsvn_wc/entries.c
  (write_entry): Handle deleted=TRUE with schedule add.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_not_present_replaced): Extend to run update and status.

Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1186434r1=1186433r2=1186434view=diff
==
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Oct 19 19:55:30 2011
@@ -1672,6 +1672,13 @@ write_entry(struct write_baton **entry_n
 
   case svn_wc_schedule_add:
 working_node = MAYBE_ALLOC(working_node, result_pool);
+if (entry-deleted)
+  {
+if (parent_node-base)
+  base_node = MAYBE_ALLOC(base_node, result_pool);
+else
+  below_working_node = MAYBE_ALLOC(below_working_node, 
result_pool);
+  }
 break;
 
   case svn_wc_schedule_delete:
@@ -1695,9 +1702,12 @@ write_entry(struct write_baton **entry_n
  BASE node to indicate the not-present node.  */
   if (entry-deleted)
 {
-  SVN_ERR_ASSERT(base_node  !working_node  !below_working_node);
+  SVN_ERR_ASSERT(base_node || below_working_node);
   SVN_ERR_ASSERT(!entry-incomplete);
-  base_node-presence = svn_wc__db_status_not_present;
+  if (base_node)
+base_node-presence = svn_wc__db_status_not_present;
+  else
+below_working_node-presence = svn_wc__db_status_not_present;
 }
   else if (entry-absent)
 {

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186434r1=1186433r2=1186434view=diff
==
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 
19:55:30 2011
@@ -1244,6 +1244,16 @@ def upgrade_not_present_replaced(sbox):
  'file:///tmp/repo', sbox.repo_url,
  sbox.wc_dir)
 
+  expected_output = svntest.wc.State(sbox.wc_dir, {
+  'A/B/E' : Item(status='E '),
+  'A/B/E/alpha'   : Item(status='A '),
+  'A/B/E/beta': Item(status='A '),
+  'A/B/lambda': Item(status='E '),
+  })
+  expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
+  svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
+None, expected_status)
+
 
 # Run the tests
 

svn commit: r1186486 - /subversion/trunk/subversion/libsvn_delta/compat.c

[hwright]

Author: hwright
Date: Wed Oct 19 20:55:42 2011
New Revision: 1186486

URL: http://svn.apache.org/viewvc?rev=1186486view=rev
Log:
Ev2 shims: handle setting contents from Ev2 to the delta editor.

(None of this is very well tested right now.)

* subversion/libsvn_delta/compat.c
  (add_file_cb, set_text_cb): Spool the contents to a temporary file for later
consumption.
  (drive): If we have a source and file baton, set the text to the appropriate
contents.

Modified:
subversion/trunk/subversion/libsvn_delta/compat.c

Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1186486r1=1186485r2=1186486view=diff
==
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Oct 19 20:55:42 2011
@@ -743,9 +743,18 @@ add_file_cb(void *baton,
 apr_pool_t *scratch_pool)
 {
   struct editor_baton *eb = baton;
+  const char *tmp_filename;
+  svn_stream_t *tmp_stream;
+
+  /* Spool the contents to a tempfile, and provide that to the driver. */
+  SVN_ERR(svn_stream_open_unique(tmp_stream, tmp_filename, NULL,
+ svn_io_file_del_on_pool_cleanup,
+ eb-edit_pool, scratch_pool));
+  SVN_ERR(svn_stream_copy3(svn_stream_disown(contents, scratch_pool),
+   tmp_stream, NULL, NULL, scratch_pool));
 
   SVN_ERR(build(eb, ACTION_PUT, relpath, NULL, SVN_INVALID_REVNUM,
-NULL, NULL, SVN_INVALID_REVNUM, scratch_pool));
+NULL, tmp_filename, SVN_INVALID_REVNUM, scratch_pool));
 
   return SVN_NO_ERROR;
 }
@@ -799,6 +808,20 @@ set_text_cb(void *baton,
 svn_stream_t *contents,
 apr_pool_t *scratch_pool)
 {
+  struct editor_baton *eb = baton;
+  const char *tmp_filename;
+  svn_stream_t *tmp_stream;
+
+  /* Spool the contents to a tempfile, and provide that to the driver. */
+  SVN_ERR(svn_stream_open_unique(tmp_stream, tmp_filename, NULL,
+ svn_io_file_del_on_pool_cleanup,
+ eb-edit_pool, scratch_pool));
+  SVN_ERR(svn_stream_copy3(svn_stream_disown(contents, scratch_pool),
+   tmp_stream, NULL, NULL, scratch_pool));
+
+  SVN_ERR(build(eb, ACTION_PUT, relpath, NULL, SVN_INVALID_REVNUM,
+NULL, tmp_filename, SVN_INVALID_REVNUM, scratch_pool));
+
   return SVN_NO_ERROR;
 }
 
@@ -880,6 +903,22 @@ drive(const struct operation *operation,
  file_baton));
 }
 
+  if (child-src_file  file_baton)
+{
+  /* We need to change textual contents. */
+  svn_txdelta_window_handler_t handler;
+  void *handler_baton;
+  svn_stream_t *contents;
+
+  SVN_ERR(editor-apply_textdelta(file_baton, NULL, iterpool,
+  handler, handler_baton));
+  SVN_ERR(svn_stream_open_readonly(contents, child-src_file,
+   iterpool, iterpool));
+  SVN_ERR(svn_txdelta_send_stream(contents, handler, handler_baton,
+  NULL, iterpool));
+  SVN_ERR(svn_stream_close(contents));
+}
+
   /*SVN_DBG((child: '%s'; operation: %d\n, path, child-operation));*/
   if (child-kind == svn_kind_dir)
 SVN_ERR(drive(child, editor, iterpool));

Re: svn commit: r1186252 - in /subversion/branches/1.7.x-r1180154: ./ subversion/include/svn_sorts.h subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/libsvn_subr/sorts.c

[Daniel Shahaf]

Paul Burba wrote on Wed, Oct 19, 2011 at 14:58:06 -0400:
 It may be a moot point now, since this has already been backported,
 but I adjusted the log message to better explain what I meant:
 http://svn.apache.org/viewvc?view=revisionrevision=1186252
 
 Hopefully that clears things up, let me know if you still have any concerns.

Looks good to me.  On behalf of future code archeologists, thanks :-)

svn commit: r1186515 - /subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

[danielsh]

Author: danielsh
Date: Wed Oct 19 21:52:31 2011
New Revision: 1186515

URL: http://svn.apache.org/viewvc?rev=1186515view=rev
Log:
Follow-up to r1186392.

* subversion/tests/cmdline/svnadmin_tests.py
  (load_ranges): After loading, dump again and compare that to the original 
dump,
accounting for property lines via using svntest.verify.UnorderedOutput().

Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1186515r1=1186514r2=1186515view=diff
==
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Wed Oct 19 
21:52:31 2011
@@ -1489,7 +1489,8 @@ def load_ranges(sbox):
   dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]),
'svnadmin_tests_data',
'skeleton_repos.dump')
-  dumpdata = open(dumpfile_location).read()
+  dumplines = open(dumpfile_location).readlines()
+  dumpdata = .join(dumplines)
 
   # Load our dumpfile, 2 revisions at a time, verifying that we have
   # the correct youngest revision after each load.
@@ -1503,13 +1504,11 @@ def load_ranges(sbox):
   svntest.actions.run_and_verify_svnlook(Unexpected output, ['6\n'],
  None, 'youngest', sbox.repo_dir)
 
-  ### Would prefer to do a dump comparison such as the following, by
-  ### there are ordering differences, it seems, in the property
-  ### blocks.
-  #dumpdata = open(dumpfile_location).readlines()
-  #new_dumpdata = svntest.actions.run_and_verify_dump(sbox.repo_dir)
-  #svntest.verify.compare_and_display_lines(Dump files, DUMP,
-  # dumpdata, new_dumpdata)
+  # There are ordering differences in the property blocks.
+  expected_dump = UnorderedOutput(dumplines)
+  new_dumpdata = svntest.actions.run_and_verify_dump(sbox.repo_dir)
+  svntest.verify.compare_and_display_lines(Dump files, DUMP,
+   expected_dump, new_dumpdata)
 
 
 # Run the tests

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

[gstein]

Author: gstein
Date: Wed Oct 19 22:17:08 2011
New Revision: 1186536

URL: http://svn.apache.org/viewvc?rev=1186536view=rev
Log:
reviewed 1185738 group.

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=1186536r1=1186535r2=1186536view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 22:17:08 2011
@@ -73,8 +73,9 @@ Approved changes:
Notes:
  r1185738, r1185763, r1185768: adds a test for this problem.
  r1185886: fixes this issue and cleans up whitespace in the test.
+ r1186240: small test reorganization.
  Merge conflicts with issue r1177732 group.  Branch includes both sets.
Branch:
  ^/subversion/branches/1.7.x-issue4035-r1185738
Votes:
- +1: rhuijben, philip, stsp
+ +1: rhuijben, philip, stsp, gstein

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

[rhuijben]

Author: rhuijben
Date: Wed Oct 19 23:28:06 2011
New Revision: 1186567

URL: http://svn.apache.org/viewvc?rev=1186567view=rev
Log:
* STATUS: Cast yet another vote

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=1186567r1=1186566r2=1186567view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 23:28:06 2011
@@ -27,7 +27,7 @@ Candidate changes:
  * r1185746, r1186059
Fix up some erroneous Could not frob some targets because... warnings.
Votes:
- +1: stsp
+ +1: stsp, rhuijben
 
  * r1177732, r1186092, r1186101, r1186107, r1186109
Fix issue 4035.

Re: svn commit: r1186515 - /subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

[C. Michael Pilato]

On 10/19/2011 05:52 PM, danie...@apache.org wrote:
 Author: danielsh
 Date: Wed Oct 19 21:52:31 2011
 New Revision: 1186515
 
 URL: http://svn.apache.org/viewvc?rev=1186515view=rev
 Log:
 Follow-up to r1186392.
 
 * subversion/tests/cmdline/svnadmin_tests.py
   (load_ranges): After loading, dump again and compare that to the original 
 dump,
 accounting for property lines via using svntest.verify.UnorderedOutput().

Ah!  Sweet -- I'd forgotten about this approach.

-- 
C. Michael Pilato cmpil...@collab.net
CollabNet  www.collab.net  Distributed Development On Demand



signature.asc
Description: OpenPGP digital signature