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

[neels]

Author: neels
Date: Fri Sep 23 08:20:00 2011
New Revision: 1174582

URL: http://svn.apache.org/viewvc?rev=1174582view=rev
Log:
Follow-up to r1171353.
* subversion/libsvn_wc/status.c (one_child_status):
Use correct node kind const. No functional change expected, since by
coincidence, svn_node_unknown == svn_wc__db_kind_unknown == 3.
Found by: philip

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

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1174582r1=1174581r2=1174582view=diff
==
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Fri Sep 23 08:20:00 2011
@@ -1137,7 +1137,7 @@ one_child_status(const struct walk_statu
info-status != svn_wc__db_status_not_present
info-status != svn_wc__db_status_excluded
info-status != svn_wc__db_status_server_excluded
-   !(info-kind == svn_node_unknown
+   !(info-kind == svn_wc__db_kind_unknown
 info-status == svn_wc__db_status_normal))
 {
   if (depth == svn_depth_files

svn propchange: r1174139 - svn:log

[neels]

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

Modified: svn:log at Fri Sep 23 08:34:44 2011
--
--- svn:log (original)
+++ svn:log Fri Sep 23 08:34:44 2011
@@ -1,3 +1,4 @@
+-- This was reverted in r1174166, then fixed  committed in r1174342. --
 Try to find proper URL information on externals during upgrade. Do this only
 after the existing prop upgrade ran through, as repository information is
 easiest to obtain after all that. Issue #4016.

svn commit: r1174612 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

[neels]

Author: neels
Date: Fri Sep 23 09:30:18 2011
New Revision: 1174612

URL: http://svn.apache.org/viewvc?rev=1174612view=rev
Log:
* subversion/libsvn_wc/wc-metadata.sql (format-99): Add a todo comment.


Modified:
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1174612r1=1174611r2=1174612view=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Fri Sep 23 09:30:18 
2011
@@ -540,7 +540,7 @@ CREATE TABLE EXTERNALS (
   local_relpath  TEXT NOT NULL,
 
   /* The working copy root can't be recorded as an external in itself
- so this will never be NULL. */
+ so this will never be NULL. ### ATM only inserted, never queried */
   parent_relpath  TEXT NOT NULL,
 
   /* Repository location fields */
@@ -770,6 +770,9 @@ PRAGMA user_version = 29;
 /* TODO: Un-confuse *_revision column names in the EXTERNALS table to
-roperative foo@peg, as suggested by the patch attached to
http://svn.haxx.se/dev/archive-2011-09/0478.shtml */
+/* TODO: Remove column parent_relpath from EXTERNALS. We're not using it and
+   never will. It's not interesting like in the NODES table: the external's
+   parent path may be *anything*: unversioned, behind a another WC... */
 
 /* Now drop the tree_conflict_data column from actual_node. */
 CREATE TABLE ACTUAL_NODE_BACKUP (

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

[neels]

Author: neels
Date: Fri Sep 23 09:52:09 2011
New Revision: 1174625

URL: http://svn.apache.org/viewvc?rev=1174625view=rev
Log:
* ../branches/1.7.x/STATUS: Remove premature nomination of r1174342 :/

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=1174625r1=1174624r2=1174625view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 09:52:09 2011
@@ -145,21 +145,6 @@ Candidate changes:
  if the backport is done that way).
  +1: danielsh (conditioned upon the backport done as per Paul's comment)
 
- * r1174342
-   Fix issue #4016: 'externals after upgrade from 1.6 have wrong URL
-   information in EXTERNALS rows'
-   Also: previously, the first failing external upgrade aborted all other
-   external upgrades, now just prints the error and carries on.
-   Justification:
- Users will start upgrading their WCs right after the 1.7.0 release, and
- it would be nice to have proper information in wc.db. I know of no real
- problems when EXTERNALS rows are wrong and/or missing info, but we might
- see them soon enough, or even hit problems if same users upgrade same WCs
- to 1.8, much later.  Those (few?) users may be very thankful (i.e. not
- annoyed; as goes with the entire upgrade subcommand).
-   Votes:
- +1: neels
-
 Veto-blocked changes:
 =
 

svn commit: r1174652 - /subversion/trunk/subversion/libsvn_subr/io.c

[ivan]

Author: ivan
Date: Fri Sep 23 11:01:09 2011
New Revision: 1174652

URL: http://svn.apache.org/viewvc?rev=1174652view=rev
Log:
Fix Windows retry loop error handling when removing file.

* subversion/libsvn_subr/io.c
  (svn_io_remove_file2): Check apr_err before returning error to handle 
   situation when WIN32_RETRY_LOOP recovered original error.

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

Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1174652r1=1174651r2=1174652view=diff
==
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Fri Sep 23 11:01:09 2011
@@ -2158,8 +2158,11 @@ svn_io_remove_file2(const char *path,
 }
 #endif
 
-  return svn_error_wrap_apr(apr_err, _(Can't remove file '%s'),
-svn_dirent_local_style(path, scratch_pool));
+  if (apr_err)
+return svn_error_wrap_apr(apr_err, _(Can't remove file '%s'),
+  svn_dirent_local_style(path, scratch_pool));
+
+  return SVN_NO_ERROR;
 }
 
 

svn commit: r1174665 - /subversion/branches/1.7.x/subversion/libsvn_subr/io.c

[ivan]

Author: ivan
Date: Fri Sep 23 11:21:17 2011
New Revision: 1174665

URL: http://svn.apache.org/viewvc?rev=1174665view=rev
Log:
* STATUS: Propose r1174652 for backport.

Modified:
subversion/branches/1.7.x/subversion/libsvn_subr/io.c

Modified: subversion/branches/1.7.x/subversion/libsvn_subr/io.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/io.c?rev=1174665r1=1174664r2=1174665view=diff
==
--- subversion/branches/1.7.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/io.c Fri Sep 23 11:21:17 
2011
@@ -2151,8 +2151,11 @@ svn_io_remove_file2(const char *path,
 }
 #endif
 
-  return svn_error_wrap_apr(apr_err, _(Can't remove file '%s'),
-svn_dirent_local_style(path, scratch_pool));
+  if (apr_err)
+return svn_error_wrap_apr(apr_err, _(Can't remove file '%s'),
+  svn_dirent_local_style(path, scratch_pool));
+
+  return SVN_NO_ERROR;
 }
 
 

svn commit: r1174666 - /subversion/branches/1.7.x/subversion/libsvn_subr/io.c

[ivan]

Author: ivan
Date: Fri Sep 23 11:23:38 2011
New Revision: 1174666

URL: http://svn.apache.org/viewvc?rev=1174666view=rev
Log:
Revert r1174665: I've acidentally committed wrong file.

Modified:
subversion/branches/1.7.x/subversion/libsvn_subr/io.c

Modified: subversion/branches/1.7.x/subversion/libsvn_subr/io.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/io.c?rev=1174666r1=1174665r2=1174666view=diff
==
--- subversion/branches/1.7.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/io.c Fri Sep 23 11:23:38 
2011
@@ -2151,11 +2151,8 @@ svn_io_remove_file2(const char *path,
 }
 #endif
 
-  if (apr_err)
-return svn_error_wrap_apr(apr_err, _(Can't remove file '%s'),
-  svn_dirent_local_style(path, scratch_pool));
-
-  return SVN_NO_ERROR;
+  return svn_error_wrap_apr(apr_err, _(Can't remove file '%s'),
+svn_dirent_local_style(path, scratch_pool));
 }
 
 

svn propchange: r1174665 - svn:log

[ivan]

Author: ivan
Revision: 1174665
Modified property: svn:log

Modified: svn:log at Fri Sep 23 11:24:44 2011
--
--- svn:log (original)
+++ svn:log Fri Sep 23 11:24:44 2011
@@ -1 +1,3 @@
+[ Note from the future: reverted in r1174666. ]
+
 * STATUS: Propose r1174652 for backport.

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

[ivan]

Author: ivan
Date: Fri Sep 23 11:25:26 2011
New Revision: 1174667

URL: http://svn.apache.org/viewvc?rev=1174667view=rev
Log:
* STATUS: Propose r1174652 for backport.

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=1174667r1=1174666r2=1174667view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 11:25:26 2011
@@ -145,6 +145,16 @@ Candidate changes:
  if the backport is done that way).
  +1: danielsh (conditioned upon the backport done as per Paul's comment)
 
+ * r1174652
+   Fix Windows retry loop error handling when removing file. On some cases
+   svn_io_remove_file2() returns error Can't remove file '': No error, while
+   file was actually deleted from disk.
+   Justification:
+ Returning error when file actually was deleted is potentally dangerous
+ thing.
+   Votes:
+ +1: ivan
+
 Veto-blocked changes:
 =
 

svn commit: r1174693 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/cleanup.c libsvn_client/externals.c libsvn_wc/externals.c

[neels]

Author: neels
Date: Fri Sep 23 12:17:24 2011
New Revision: 1174693

URL: http://svn.apache.org/viewvc?rev=1174693view=rev
Log:
Follow-up to r1174342.
Fix some errors around relative externals URLs during upgrade, and around
checked out WCs at an external's target path which don't match the external
definition. Also improve upgrade continuation on errors with externals.

The function that resolves relative externals URLs to absolute ones is needed
in svn_client_upgrade(), so it goes from static to private API. Makes a lot of
sense: svn_wc_external_item2_t already is even *public* API, but there's no
function to make proper use of the svn_wc_external_item2_t.url field. IMHO
svn_wc__resolve_relative_external_url() should go to public API eventually,
but such move is unrelated to this patch.

* subversion/libsvn_client/cleanup.c
  (svn_client_upgrade):
- Use svn_wc__resolve_relative_external_url() to properly resolve relative
  external URLs. Previously, this would wrongly assume all externals' URLs
  to be absolute already.
- Verify that the URL, if gotten from a readily checked out external,
  actually is identical to the externals definition (i.e. detect if a
  mismatching WC is checked out at the target path).
- Don't abort on errors in externals definitions, go on with the next
  external definition (like the inner loop does already).
- Instead of obtaining an absolute path of every external item, get the
  abspath of the path that defines the externals once, and join relpaths
  with that.
- Make the error handling slightly less complex to read by a little bit of
  code dup.
- Rename local var (EXTERNAL_KIND), tweak comments.

* subversion/include/private/svn_wc_private.h,
* subversion/libsvn_wc/externals.c
  (svn_wc__resolve_relative_external_url):
Move here and rename from ...
* subversion/libsvn_client/externals.c
  (resolve_relative_external_url):
... this.
  (uri_scheme):
Move along with resolve_relative_external_url, keep as static.
  (handle_external_item_change, svn_client__export_externals):
Apply rename, no functional change.

Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/cleanup.c
subversion/trunk/subversion/libsvn_client/externals.c
subversion/trunk/subversion/libsvn_wc/externals.c

Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1174693r1=1174692r2=1174693view=diff
==
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Fri Sep 23 
12:17:24 2011
@@ -1184,6 +1184,35 @@ svn_wc__upgrade_add_external_info(svn_wc
   svn_revnum_t def_revision,
   apr_pool_t *scratch_pool);
 
+/* If the URL for @a item is relative, then using the repository root
+   URL @a repos_root_url and the parent directory URL @parent_dir_url,
+   resolve it into an absolute URL and save it in @a *resolved_url.
+
+   Regardless if the URL is absolute or not, if there are no errors,
+   the URL returned in @a *resolved_url will be canonicalized.
+
+   The following relative URL formats are supported:
+
+ ../relative to the parent directory of the external
+ ^/ relative to the repository root
+ // relative to the scheme
+ /  relative to the server's hostname
+
+   The ../ and ^/ relative URLs may use .. to remove path elements up
+   to the server root.
+
+   The external URL should not be canonicalized before calling this function,
+   as otherwise the scheme relative URL '//host/some/path' would have been
+   canonicalized to '/host/some/path' and we would not be able to match on
+   the leading '//'. */
+svn_error_t *
+svn_wc__resolve_relative_external_url(const char **resolved_url,
+  const svn_wc_external_item2_t *item,
+  const char *repos_root_url,
+  const char *parent_dir_url,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=1174693r1=1174692r2=1174693view=diff
==
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Fri Sep 23 12:17:24 2011
@@ -155,62 +155,108 @@ svn_client_upgrade(const char *path,
hi = apr_hash_next(hi))
 {
   int i;
+  

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

[philip]

Author: philip
Date: Fri Sep 23 12:26:22 2011
New Revision: 1174697

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

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=1174697r1=1174696r2=1174697view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 12:26:22 2011
@@ -153,7 +153,7 @@ Candidate changes:
  Returning error when file actually was deleted is potentally dangerous
  thing.
Votes:
- +1: ivan
+ +1: ivan, philip
 
 Veto-blocked changes:
 =

svn commit: r1174699 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

[neels]

Author: neels
Date: Fri Sep 23 12:28:52 2011
New Revision: 1174699

URL: http://svn.apache.org/viewvc?rev=1174699view=rev
Log:
Remove stuff obsoleted by r1174342, r1174693.

* subversion/libsvn_wc/wc_db.c (svn_wc__db_upgrade_apply_props):
Remove loop adding rows to EXTERNALS table. After above revisions, these
rows are populated after all upgrades are done, from svn_client_upgrade().

* subversion/libsvn_wc/wc-queries.sql (STMT_INSERT_EXTERNAL_UPGRADE):
Remove statement, only STMT_INSERT_EXTERNAL is used now (the purpose was
to obtain a file external's kind, which is now also done further up in
svn_client_upgrade()).

Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1174699r1=1174698r2=1174699view=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri Sep 23 12:28:52 
2011
@@ -950,16 +950,6 @@ INSERT OR REPLACE INTO externals (
 repos_id, def_repos_relpath, def_operational_revision, def_revision)
 VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)
 
--- STMT_INSERT_EXTERNAL_UPGRADE
-INSERT OR REPLACE INTO externals (
-wc_id, local_relpath, parent_relpath, presence, kind, def_local_relpath,
-repos_id, def_repos_relpath, def_operational_revision, def_revision)
-VALUES (?1, ?2, ?3, ?4,
-CASE WHEN (SELECT file_external FROM nodes
-   WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0)
- IS NOT NULL THEN 'file' ELSE 'unknown' END,
-?5, ?6, ?7, ?8, ?9)
-
 -- STMT_SELECT_EXTERNAL_INFO
 SELECT presence, kind, def_local_relpath, repos_id,
 def_repos_relpath, def_operational_revision, def_revision

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1174699r1=1174698r2=1174699view=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Sep 23 12:28:52 2011
@@ -10364,52 +10364,6 @@ svn_wc__db_upgrade_apply_props(svn_sqlit
sdb, scratch_pool));
 }
 
-  if (kind == svn_wc__db_kind_dir)
-{
-  const char *externals;
-  apr_hash_t *props = working_props;
-
-  if (props == NULL)
-props = base_props;
-
-  externals = svn_prop_get_value(props, SVN_PROP_EXTERNALS);
-
-  if (externals != NULL)
-{
-  int i;
-  apr_array_header_t *ext;
-
-  SVN_ERR(svn_sqlite__get_statement(stmt, sdb,
-STMT_INSERT_EXTERNAL_UPGRADE));
-
-  SVN_ERR(svn_wc_parse_externals_description3(
-ext, svn_dirent_join(dir_abspath, local_relpath,
-  scratch_pool),
-externals, FALSE, scratch_pool));
-  for (i = 0; i  ext-nelts; i++)
-{
-  const svn_wc_external_item2_t *item;
-  const char *item_relpath;
-
-  item = APR_ARRAY_IDX(ext, i, const svn_wc_external_item2_t *);
-  item_relpath = svn_relpath_join(local_relpath, item-target_dir,
-  scratch_pool);
-
-  SVN_ERR(svn_sqlite__bindf(stmt, iis,
-wc_id,
-item_relpath,
-svn_relpath_dirname(item_relpath,
-scratch_pool),
-normal,
-local_relpath,
-(apr_int64_t)1, /* repos_id */
- /* repos_relpath */));
-
-  SVN_ERR(svn_sqlite__insert(NULL, stmt));
-}
-}
-}
-
   return SVN_NO_ERROR;
 }
 

svn commit: r1174714 - /subversion/branches/1.7.x-i4016/

[neels]

Author: neels
Date: Fri Sep 23 12:51:22 2011
New Revision: 1174714

URL: http://svn.apache.org/viewvc?rev=1174714view=rev
Log:
* ../branches/1.7.x-i4016: Create backport branch for issue #4016.

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

Propchange: subversion/branches/1.7.x-i4016/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Fri Sep 23 12:51:22 2011
@@ -0,0 +1,2 @@
+[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+
+(\d+)

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

Propchange: subversion/branches/1.7.x-i4016/
--
--- svn:ignore (added)
+++ svn:ignore Fri Sep 23 12:51:22 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-i4016/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 23 12:51:22 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/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-3668-3669:1031000-1035744
+/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: r1174721 - in /subversion/branches/1.7.x-i4016: ./ subversion/libsvn_client/externals.c

[neels]

Author: neels
Date: Fri Sep 23 12:59:30 2011
New Revision: 1174721

URL: http://svn.apache.org/viewvc?rev=1174721view=rev
Log:
Merge r1173574 from trunk.
Cosmetic change to a function that is going to be moved in r1174693.

* subversion/libsvn_client/externals.c (resolve_relative_external_url): Comment.

Modified:
subversion/branches/1.7.x-i4016/   (props changed)
subversion/branches/1.7.x-i4016/subversion/libsvn_client/externals.c

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

Modified: subversion/branches/1.7.x-i4016/subversion/libsvn_client/externals.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x-i4016/subversion/libsvn_client/externals.c?rev=1174721r1=1174720r2=1174721view=diff
==
--- subversion/branches/1.7.x-i4016/subversion/libsvn_client/externals.c 
(original)
+++ subversion/branches/1.7.x-i4016/subversion/libsvn_client/externals.c Fri 
Sep 23 12:59:30 2011
@@ -530,10 +530,10 @@ error:
 
 /* If the URL for @a item is relative, then using the repository root
URL @a repos_root_url and the parent directory URL @parent_dir_url,
-   resolve it into an absolute URL and save it in @a item.
+   resolve it into an absolute URL and save it in @a *resolved_url.
 
Regardless if the 

svn commit: r1174725 - in /subversion/branches/1.7.x-i4016: ./ subversion/include/private/svn_wc_private.h subversion/libsvn_client/cleanup.c subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc_db.

[neels]

Author: neels
Date: Fri Sep 23 13:02:22 2011
New Revision: 1174725

URL: http://svn.apache.org/viewvc?rev=1174725view=rev
Log:
Merge r1174342, part one of issue #4016 fix.

Issue #4016. Try to find proper URL information on externals during upgrade.
Do this after the entire upgrade ran through, as repository information is
easiest to obtain after all the rest has been upgraded.

(This might obsolete some parts of the existing externals prop upgrade code.
But removing is for another patch, and might just be micro-optimization.)

* subversion/libsvn_client/cleanup.c
  (svn_client_upgrade): 
Fetch all URL and revisions information from upgraded externals' working
copies, or from fetch_repos_info() if not checked out yet. This properly
populates the EXTERNALS table rows for upgraded externals of all kinds.
Furthermore, change error handling in the externals upgrade loop so that
one externals failure does not abort upgrade of other externals.

* subversion/include/private/svn_wc_private.h,
* subversion/libsvn_wc/upgrade.c
  (svn_wc__upgrade_add_external_info): New function.

* subversion/libsvn_wc/wc_db.h,
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_upgrade_insert_external): New function.


Modified:
subversion/branches/1.7.x-i4016/   (props changed)
subversion/branches/1.7.x-i4016/subversion/include/private/svn_wc_private.h
subversion/branches/1.7.x-i4016/subversion/libsvn_client/cleanup.c
subversion/branches/1.7.x-i4016/subversion/libsvn_wc/upgrade.c
subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc_db.c
subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc_db.h

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

svn commit: r1174732 - in /subversion/branches/1.7.x-i4016: ./ subversion/include/private/svn_wc_private.h subversion/libsvn_client/cleanup.c subversion/libsvn_client/externals.c subversion/libsvn_wc/

[neels]

Author: neels
Date: Fri Sep 23 13:11:21 2011
New Revision: 1174732

URL: http://svn.apache.org/viewvc?rev=1174732view=rev
Log:
Merge r1174693, part two of issue #4016 fix.
Resolve a text conflict to theirs-conflict because of indentation mismatch
(caused by a cosmetic change from r1169770 in handle_external_item_change()).

Follow-up to r1174342.
Fix some errors around relative externals URLs during upgrade, and around
checked out WCs at an external's target path which don't match the external
definition. Also improve upgrade continuation on errors with externals.

The function that resolves relative externals URLs to absolute ones is needed
in svn_client_upgrade(), so it goes from static to private API. Makes a lot of
sense: svn_wc_external_item2_t already is even *public* API, but there's no
function to make proper use of the svn_wc_external_item2_t.url field. IMHO
svn_wc__resolve_relative_external_url() should go to public API eventually,
but such move is unrelated to this patch.

* subversion/libsvn_client/cleanup.c
  (svn_client_upgrade):
- Use svn_wc__resolve_relative_external_url() to properly resolve relative
  external URLs. Previously, this would wrongly assume all externals' URLs
  to be absolute already.
- Verify that the URL, if gotten from a readily checked out external,
  actually is identical to the externals definition (i.e. detect if a
  mismatching WC is checked out at the target path).
- Don't abort on errors in externals definitions, go on with the next
  external definition (like the inner loop does already).
- Instead of obtaining an absolute path of every external item, get the
  abspath of the path that defines the externals once, and join relpaths
  with that.
- Make the error handling slightly less complex to read by a little bit of
  code dup.
- Rename local var (EXTERNAL_KIND), tweak comments.

* subversion/include/private/svn_wc_private.h,
* subversion/libsvn_wc/externals.c
  (svn_wc__resolve_relative_external_url):
Move here and rename from ...
* subversion/libsvn_client/externals.c
  (resolve_relative_external_url):
... this.
  (uri_scheme):
Move along with resolve_relative_external_url, keep as static.
  (handle_external_item_change, svn_client__export_externals):
Apply rename, no functional change.

Modified:
subversion/branches/1.7.x-i4016/   (props changed)
subversion/branches/1.7.x-i4016/subversion/include/private/svn_wc_private.h
subversion/branches/1.7.x-i4016/subversion/libsvn_client/cleanup.c
subversion/branches/1.7.x-i4016/subversion/libsvn_client/externals.c
subversion/branches/1.7.x-i4016/subversion/libsvn_wc/externals.c

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

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

[neels]

Author: neels
Date: Fri Sep 23 13:13:40 2011
New Revision: 1174735

URL: http://svn.apache.org/viewvc?rev=1174735view=rev
Log:
Merge r1174699, removing stuff obsoleted by the previous two merged revisions.

Remove stuff obsoleted by r1174342, r1174693.

* subversion/libsvn_wc/wc_db.c (svn_wc__db_upgrade_apply_props):
Remove loop adding rows to EXTERNALS table. After above revisions, these
rows are populated after all upgrades are done, from svn_client_upgrade().

* subversion/libsvn_wc/wc-queries.sql (STMT_INSERT_EXTERNAL_UPGRADE):
Remove statement, only STMT_INSERT_EXTERNAL is used now (the purpose was
to obtain a file external's kind, which is now also done further up in
svn_client_upgrade()).

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

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

Modified: subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc-queries.sql
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc-queries.sql?rev=1174735r1=1174734r2=1174735view=diff

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

[danielsh]

Author: danielsh
Date: Fri Sep 23 13:38:13 2011
New Revision: 1174749

URL: http://svn.apache.org/viewvc?rev=1174749view=rev
Log:
Approve r1174652.

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=1174749r1=1174748r2=1174749view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 13:38:13 2011
@@ -145,6 +145,12 @@ Candidate changes:
  if the backport is done that way).
  +1: danielsh (conditioned upon the backport done as per Paul's comment)
 
+Veto-blocked changes:
+=
+
+Approved changes:
+=
+
  * r1174652
Fix Windows retry loop error handling when removing file. On some cases
svn_io_remove_file2() returns error Can't remove file '': No error, while
@@ -153,10 +159,4 @@ Candidate changes:
  Returning error when file actually was deleted is potentally dangerous
  thing.
Votes:
- +1: ivan, philip
-
-Veto-blocked changes:
-=
-
-Approved changes:
-=
+ +1: ivan, philip, danielsh

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

[danielsh]

Author: danielsh
Date: Fri Sep 23 13:39:47 2011
New Revision: 1174752

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

 * r1174652
   Fix Windows retry loop error handling when removing file. On some cases
   svn_io_remove_file2() returns error Can't remove file '': No error, while
   file was actually deleted from disk.
   Justification:
 Returning error when file actually was deleted is potentally dangerous
 thing.
   Votes:
 +1: ivan, philip, danielsh

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

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

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1174752r1=1174751r2=1174752view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 13:39:47 2011
@@ -150,13 +150,3 @@ Veto-blocked changes:
 
 Approved changes:
 =
-
- * r1174652
-   Fix Windows retry loop error handling when removing file. On some cases
-   svn_io_remove_file2() returns error Can't remove file '': No error, while
-   

svn commit: r1174761 - /subversion/trunk/build/ac-macros/zlib.m4

[danielsh]

Author: danielsh
Date: Fri Sep 23 13:49:03 2011
New Revision: 1174761

URL: http://svn.apache.org/viewvc?rev=1174761view=rev
Log:
Give a better error message when configured with '--without-zlib'.

* build/ac-macros/zlib.m4
  (SVN_LIB_Z): Look for $withval=no as well.

Patch by: Alexander Thomas alexan...@collab.net
(log message by me)

Modified:
subversion/trunk/build/ac-macros/zlib.m4

Modified: subversion/trunk/build/ac-macros/zlib.m4
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/zlib.m4?rev=1174761r1=1174760r2=1174761view=diff
==
--- subversion/trunk/build/ac-macros/zlib.m4 (original)
+++ subversion/trunk/build/ac-macros/zlib.m4 Fri Sep 23 13:49:03 2011
@@ -32,6 +32,8 @@ AC_DEFUN(SVN_LIB_Z,
   [
 if test $withval = yes ; then
   AC_MSG_ERROR([--with-zlib requires an argument.])
+elif test $withval = no ; then
+  AC_MSG_ERROR([cannot compile without zlib.])
 else
   AC_MSG_NOTICE([zlib library configuration])
   zlib_prefix=$withval

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

[danielsh]

Author: danielsh
Date: Fri Sep 23 13:50:35 2011
New Revision: 1174763

URL: http://svn.apache.org/viewvc?rev=1174763view=rev
Log:
Nominate r1174761.

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=1174763r1=1174762r2=1174763view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 13:50:35 2011
@@ -145,6 +145,11 @@ Candidate changes:
  if the backport is done that way).
  +1: danielsh (conditioned upon the backport done as per Paul's comment)
 
+ * r1174761
+   Better error message when configuring --without-zlib.
+   Votes:
+ +1: danielsh
+
 Veto-blocked changes:
 =
 

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

[neels]

Author: neels
Date: Fri Sep 23 14:01:04 2011
New Revision: 1174774

URL: http://svn.apache.org/viewvc?rev=1174774view=rev
Log:
* ../branches/1.7.x/STATUS: Nominate r1173574, r1174342, r1174693, r1174699.

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=1174774r1=1174773r2=1174774view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 14:01:04 2011
@@ -150,6 +150,33 @@ Candidate changes:
Votes:
  +1: danielsh
 
+ * r1173574, r1174342, r1174693, r1174699
+   Fix issue #4016: 'externals after upgrade from 1.6 have wrong URL
+   information in EXTERNALS rows'
+   Also: previously, the first failing external upgrade aborted all other
+   external upgrades, now just prints the error and carries on.
+   Justification:
+ Users will start upgrading their WCs right after the 1.7.0 release, and
+ it would be nice to have proper information in wc.db. I know of no real
+ problems when EXTERNALS rows are wrong and/or missing info, but we might
+ see them soon enough, or hit problems if same users upgrade same WCs
+ to 1.8, much later.
+ Argument against: If EXTERNALS is just some sort of cache perhaps
+   upgrade should just leave the columns null?
+ Argument for: Currently 1.7 populates those columns. So upgrade should,
+   too. We don't know which way we'll go -- drop EXTERNALS columns or
+   heavily rely on them. So rather make an upgraded 1.6 WC look exactly
+   the same as a fresh 1.7 WC would, saving us complex special cases in
+   subsequent upgrade code. Meaning: power users with age-old WCs won't
+   get dropped during upgrade to 1.8, whichever way we choose.
+   Notes:
+ r1173574 is just a cosmetic change that avoids conflicts in r1174693.
+ r1174699 removes obsoleted stuff, but doesn't change the outcome.
+   Conflicts:
+ --accept=tc (r1174693, indent mismatch in handle_external_item_change()
+   Votes: caused by cosmetic fix from r1169770)
+ +1: neels
+
 Veto-blocked changes:
 =
 

svn commit: r1174797 - /subversion/trunk/subversion/libsvn_client/merge.c

[pburba]

Author: pburba
Date: Fri Sep 23 14:23:20 2011
New Revision: 1174797

URL: http://svn.apache.org/viewvc?rev=1174797view=rev
Log:
Revert a small part of the issue #3668 and issue #3669 fixes that escaped
the reversion of those same fixes in r1173425 -- see
http://svn.haxx.se/dev/archive-2011-09/0495.shtml

* subversion/libsvn_client/merge.c
  (do_file_merge): Don't bother asking for the target's entire history as
   implicit mergeinfo since we don't do anything with history older than the
   oldest revision being merged.



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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1174797r1=1174796r2=1174797view=diff
==
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Sep 23 14:23:20 2011
@@ -6822,7 +6822,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
inherited, svn_mergeinfo_inherited,
merge_b-ra_session1, target_abspath,
MAX(revision1, revision2),
-   0, /* Get all implicit mergeinfo */
+   MIN(revision1, revision2),
ctx, scratch_pool, iterpool);
 
   if (err)

svn commit: r1174798 - /subversion/trunk/build/ac-macros/zlib.m4

[danielsh]

Author: danielsh
Date: Fri Sep 23 14:23:31 2011
New Revision: 1174798

URL: http://svn.apache.org/viewvc?rev=1174798view=rev
Log:
* build/ac-macros/zlib.m4
  (SVN_LIB_Z): DTRT when --with-zlib is passed without an argument.

Found by: philip

Modified:
subversion/trunk/build/ac-macros/zlib.m4

Modified: subversion/trunk/build/ac-macros/zlib.m4
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/zlib.m4?rev=1174798r1=1174797r2=1174798view=diff
==
--- subversion/trunk/build/ac-macros/zlib.m4 (original)
+++ subversion/trunk/build/ac-macros/zlib.m4 Fri Sep 23 14:23:31 2011
@@ -31,7 +31,9 @@ AC_DEFUN(SVN_LIB_Z,
   [zlib compression library]),
   [
 if test $withval = yes ; then
-  AC_MSG_ERROR([--with-zlib requires an argument.])
+  AC_CHECK_HEADER(zlib.h, [
+AC_CHECK_LIB(z, inflate, [zlib_found=builtin])
+  ])
 elif test $withval = no ; then
   AC_MSG_ERROR([cannot compile without zlib.])
 else

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

[danielsh]

Author: danielsh
Date: Fri Sep 23 14:27:01 2011
New Revision: 1174803

URL: http://svn.apache.org/viewvc?rev=1174803view=rev
Log:
Nominate r1174798.

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=1174803r1=1174802r2=1174803view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 14:27:01 2011
@@ -150,6 +150,13 @@ Candidate changes:
Votes:
  +1: danielsh
 
+ * r1174798
+   DTRT when --with-zlib is passed without an argument.
+   Justification:
+ This DTRTing is normal for other --with-* options.
+   Votes:
+ +1: danielsh
+
  * r1173574, r1174342, r1174693, r1174699
Fix issue #4016: 'externals after upgrade from 1.6 have wrong URL
information in EXTERNALS rows'

svn commit: r1174806 - /subversion/trunk/build/ac-macros/zlib.m4

[danielsh]

Author: danielsh
Date: Fri Sep 23 14:28:29 2011
New Revision: 1174806

URL: http://svn.apache.org/viewvc?rev=1174806view=rev
Log:
* build/ac-macros/zlib.m4
  (SVN_LIB_Z): Don't lose the environment's $LDFLAGS for the AC_CHECK_LIB() 
call.

Modified:
subversion/trunk/build/ac-macros/zlib.m4

Modified: subversion/trunk/build/ac-macros/zlib.m4
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/zlib.m4?rev=1174806r1=1174805r2=1174806view=diff
==
--- subversion/trunk/build/ac-macros/zlib.m4 (original)
+++ subversion/trunk/build/ac-macros/zlib.m4 Fri Sep 23 14:28:29 2011
@@ -43,7 +43,7 @@ AC_DEFUN(SVN_LIB_Z,
   CPPFLAGS=$CPPFLAGS -I$zlib_prefix/include
   AC_CHECK_HEADERS(zlib.h,[
 save_ldflags=$LDFLAGS
-LDFLAGS=-L$zlib_prefix/lib
+LDFLAGS=$LDFLAGS -L$zlib_prefix/lib
 AC_CHECK_LIB(z, inflate, [zlib_found=yes])
 LDFLAGS=$save_ldflags
   ])

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

[danielsh]

Author: danielsh
Date: Fri Sep 23 14:30:25 2011
New Revision: 1174809

URL: http://svn.apache.org/viewvc?rev=1174809view=rev
Log:
Nominate r1174798 with an stsp justification.

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=1174809r1=1174808r2=1174809view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 14:30:25 2011
@@ -157,6 +157,13 @@ Candidate changes:
Votes:
  +1: danielsh
 
+ * r1174798
+   Fix LDFLAGS when --with-zlib is passed with an argument.
+   Justification:
+ Might save a poor soul from lots of debugging some day.
+   Votes:
+ +1: danielsh
+
  * r1173574, r1174342, r1174693, r1174699
Fix issue #4016: 'externals after upgrade from 1.6 have wrong URL
information in EXTERNALS rows'

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

[pburba]

Author: pburba
Date: Fri Sep 23 14:33:03 2011
New Revision: 1174813

URL: http://svn.apache.org/viewvc?rev=1174813view=rev
Log:
* STATUS: Add 1174797 to the r1173425 (Issue #4013) 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=1174813r1=1174812r2=1174813view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 14:33:03 2011
@@ -101,7 +101,7 @@ Candidate changes:
Votes:
  +1: stsp, rhuijben (for 1.7.1), pburba
 
- * r1173425, r1173639
+ * r1173425, r1173639, r1174797
Fix issue #4013 'merge performance regression in 1.7 when target has no
explicit mergeinfo' by reverting the fixes for issue #3669 'inheritance 
an result in mergeinfo describing nonexistent sources'.
@@ -118,12 +118,16 @@ Candidate changes:
  r1173425 is the reversion of the issue #3669 fixes including all the
  API changes.  r1173639 is the reversion of r1036078, which was a
  follow-up to the issue #3669 fixes that didn't get fully removed
- in r1173425.
+ in r1173425.  r1174797 is a one-line hunk that mistakenly was not
+ reverted in r1173425.
Notes:
  This may be missing a hunk?  See Subject: Does this need to be added to
  the #3668/#3669 revert? on dev@.  --danielsh
+ Daniel is correct, see the latest on the aforementioned thread:
+ http://svn.haxx.se/dev/archive-2011-09/0495.shtml -- pburba
Votes:
- +1: pburba, philip
+ +1: pburba
+ +1: philip (all but r1174797)
  +0: ivan (r1173425 only, restart soak period for at least two weeks due
API and client/server protocol)
  +0: danielsh (I didn't review merge_tests.py.

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

[philip]

Author: philip
Date: Fri Sep 23 16:17:06 2011
New Revision: 1174860

URL: http://svn.apache.org/viewvc?rev=1174860view=rev
Log:
* STATUS: Adjust 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=1174860r1=1174859r2=1174860view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep 23 16:17:06 2011
@@ -126,8 +126,7 @@ Candidate changes:
  Daniel is correct, see the latest on the aforementioned thread:
  http://svn.haxx.se/dev/archive-2011-09/0495.shtml -- pburba
Votes:
- +1: pburba
- +1: philip (all but r1174797)
+ +1: pburba, philip
  +0: ivan (r1173425 only, restart soak period for at least two weeks due
API and client/server protocol)
  +0: danielsh (I didn't review merge_tests.py.

svn commit: r1175068 - /subversion/trunk/get-deps.sh

[arfrever]

Author: arfrever
Date: Fri Sep 23 23:19:55 2011
New Revision: 1175068

URL: http://svn.apache.org/viewvc?rev=1175068view=rev
Log:
* get-deps.sh: Update SQLite version.

Modified:
subversion/trunk/get-deps.sh

Modified: subversion/trunk/get-deps.sh
URL: 
http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1175068r1=1175067r2=1175068view=diff
==
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Fri Sep 23 23:19:55 2011
@@ -28,7 +28,7 @@ APR_UTIL=apr-util-1.3.12
 NEON=neon-0.29.6
 SERF=serf-0.7.2
 ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.7.6.3
+SQLITE_VERSION=3.7.8
 SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | 
sed -e s/\./ /g))
 
 HTTPD=httpd-2.2.21

svn propchange: r1174039 - svn:log

[arfrever]

Author: arfrever
Revision: 1174039
Modified property: svn:log

Modified: svn:log at Fri Sep 23 23:20:52 2011
--
--- svn:log (original)
+++ svn:log Fri Sep 23 23:20:52 2011
@@ -1 +1 @@
-* get-deps.sh: Bump httpd version so something less buggy.
+* get-deps.sh: Bump httpd version to something less buggy.