[Subversion Wiki] Update of InheritedProperties by JulianFoad
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Subversion Wiki for
change notification.
The InheritedProperties page has been changed by JulianFoad:
http://wiki.apache.org/subversion/InheritedProperties?action=diffrev1=14rev2=15
Comment:
Add a note
apr_hash_t *inherited_prop_hash,
apr_pool_t *pool);
}}}
+ {{{#!wiki note
+ [JAF] What do the keys of 'inherited_prop_hash' represent if 'path' is a
working copy path but some of the inherited properties are set on repository
paths that are above the WC root?
+ }}}
Rev svn_client_proplist3 to svn_client_proplist4, adding the argument
svn_boolean_t '''get_target_inherited_props''':
{{{#!cplusplus
svn commit: r1239513 [2/2] - in /subversion/branches/reintegrate-keep-alive: ./ subversion/bindings/swig/python/libsvn_swig_py/ subversion/bindings/swig/python/tests/ subversion/include/ subversion/in
Modified:
subversion/branches/reintegrate-keep-alive/subversion/mod_dav_svn/reports/update.c
URL:
http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/mod_dav_svn/reports/update.c?rev=1239513r1=1239512r2=1239513view=diff
==
---
subversion/branches/reintegrate-keep-alive/subversion/mod_dav_svn/reports/update.c
(original)
+++
subversion/branches/reintegrate-keep-alive/subversion/mod_dav_svn/reports/update.c
Thu Feb 2 10:03:55 2012
@@ -955,8 +955,8 @@ dav_svn__update_report(const dav_resourc
cdata = dav_xml_get_cdata(child, resource-pool, 0);
if (! *cdata)
return malformed_element_error(child-name, resource-pool);
- if ((derr = dav_svn__test_canonical(cdata, resource-pool)))
-return derr;
+ if (svn_path_is_url(cdata))
+cdata = svn_uri_canonicalize(cdata, resource-pool);
if ((serr = dav_svn__simple_parse_uri(this_info, resource,
cdata, resource-pool)))
return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
@@ -970,8 +970,8 @@ dav_svn__update_report(const dav_resourc
cdata = dav_xml_get_cdata(child, resource-pool, 0);
if (! *cdata)
return malformed_element_error(child-name, resource-pool);
- if ((derr = dav_svn__test_canonical(cdata, resource-pool)))
-return derr;
+ if (svn_path_is_url(cdata))
+cdata = svn_uri_canonicalize(cdata, resource-pool);
if ((serr = dav_svn__simple_parse_uri(this_info, resource,
cdata, resource-pool)))
return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
Modified:
subversion/branches/reintegrate-keep-alive/subversion/svnrdump/dump_editor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/svnrdump/dump_editor.c?rev=1239513r1=1239512r2=1239513view=diff
==
---
subversion/branches/reintegrate-keep-alive/subversion/svnrdump/dump_editor.c
(original)
+++
subversion/branches/reintegrate-keep-alive/subversion/svnrdump/dump_editor.c
Thu Feb 2 10:03:55 2012
@@ -81,6 +81,9 @@ struct dump_edit_baton {
/* The output stream we write the dumpfile to */
svn_stream_t *stream;
+ /* A backdoor ra session to fetch additional information during the edit. */
+ svn_ra_session_t *ra_session;
+
/* Pool for per-revision allocations */
apr_pool_t *pool;
@@ -109,6 +112,9 @@ struct dump_edit_baton {
svn_boolean_t dump_text;
svn_boolean_t dump_props;
svn_boolean_t dump_newlines;
+
+ /* The revision we're currently dumping. */
+ svn_revnum_t current_revision;
};
/* Make a directory baton to represent the directory at PATH (relative
@@ -854,14 +860,112 @@ fetch_base_func(const char **filename,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- *filename = NULL;
+ struct dump_edit_baton *eb = baton;
+ svn_stream_t *fstream;
+ svn_error_t *err;
+
+ if (path[0] == '/')
+path += 1;
+
+ if (! SVN_IS_VALID_REVNUM(base_revision))
+base_revision = eb-current_revision - 1;
+
+ SVN_ERR(svn_stream_open_unique(fstream, filename, NULL,
+ svn_io_file_del_on_pool_cleanup,
+ result_pool, scratch_pool));
+
+ err = svn_ra_get_file(eb-ra_session, path, base_revision,
+fstream, NULL, NULL, scratch_pool);
+ if (err err-apr_err == SVN_ERR_FS_NOT_FOUND)
+{
+ svn_error_clear(err);
+ SVN_ERR(svn_stream_close(fstream));
+
+ *filename = NULL;
+ return SVN_NO_ERROR;
+}
+ else if (err)
+return svn_error_trace(err);
+
+ SVN_ERR(svn_stream_close(fstream));
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+fetch_props_func(apr_hash_t **props,
+ void *baton,
+ const char *path,
+ svn_revnum_t base_revision,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ struct dump_edit_baton *eb = baton;
+ svn_node_kind_t node_kind;
+
+ if (path[0] == '/')
+path += 1;
+
+ if (! SVN_IS_VALID_REVNUM(base_revision))
+base_revision = eb-current_revision - 1;
+
+ SVN_ERR(svn_ra_check_path(eb-ra_session, path, base_revision, node_kind,
+scratch_pool));
+
+ if (node_kind == svn_node_file)
+{
+ SVN_ERR(svn_ra_get_file(eb-ra_session, path, base_revision,
+ NULL, NULL, props, result_pool));
+}
+ else if (node_kind == svn_node_dir)
+{
+ apr_array_header_t *tmp_props;
+
+ SVN_ERR(svn_ra_get_dir2(eb-ra_session, NULL, NULL, props, path,
+ base_revision, 0 /* Dirent fields */,
+
svn commit: r1239530 - /subversion/branches/1.7.x/STATUS
Author: philip Date: Thu Feb 2 10:38:32 2012 New Revision: 1239530 URL: http://svn.apache.org/viewvc?rev=1239530view=rev Log: * STATUS: Vote/approve r1232413. 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=1239530r1=1239529r2=1239530view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 10:38:32 2012 @@ -77,21 +77,13 @@ Candidate changes: +1: cmpilato (r1221780 only) +1: philip, rhuijben - * r1232413 - Improve server certificate error collection code in libsvn_ra_serf. - Justification: - Problems in the certificate chain are not properly surfaced, which - could potentially allow for MitM attacks. - Votes: - +1: rhuijben, gstein - * r1235831, r1236099 Tweak the parsing of the ssl-authority-files config option to make it easier for users to configure. Justification: Low impact change to help users. Notes: - philip reports a merge conflict of r1236099, so a branch is needed + Both r1235831 and r1236099 conflict and will need a branch. Votes: +1: gstein +1: rhuijben (r1236099 only) @@ -181,3 +173,11 @@ Veto-blocked changes: Approved changes: = + + * r1232413 + Improve server certificate error collection code in libsvn_ra_serf. + Justification: + Problems in the certificate chain are not properly surfaced, which + could potentially allow for MitM attacks. + Votes: + +1: rhuijben, gstein, philip
svn commit: r1239549 - /subversion/trunk/tools/client-side/svnmucc/svnmucc.c
Author: stsp
Date: Thu Feb 2 11:25:05 2012
New Revision: 1239549
URL: http://svn.apache.org/viewvc?rev=1239549view=rev
Log:
Fix a shadowed symbol problem in svnmucc.
* tools/client-side/svnmucc/svnmucc.c
(main): Rename local variable 'getopt' to 'opts' to avoid a name clash with
the POSIX getopt() function. Resolves a compiler warning on my system.
Modified:
subversion/trunk/tools/client-side/svnmucc/svnmucc.c
Modified: subversion/trunk/tools/client-side/svnmucc/svnmucc.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnmucc/svnmucc.c?rev=1239549r1=1239548r2=1239549view=diff
==
--- subversion/trunk/tools/client-side/svnmucc/svnmucc.c (original)
+++ subversion/trunk/tools/client-side/svnmucc/svnmucc.c Thu Feb 2 11:25:05
2012
@@ -826,7 +826,7 @@ main(int argc, const char **argv)
sizeof(struct action *));
const char *anchor = NULL;
svn_error_t *err = SVN_NO_ERROR;
- apr_getopt_t *getopt;
+ apr_getopt_t *opts;
enum {
config_dir_opt = SVN_OPT_FIRST_LONGOPT_ID,
config_inline_opt,
@@ -866,15 +866,15 @@ main(int argc, const char **argv)
config_options = apr_array_make(pool, 0,
sizeof(svn_cmdline__config_argument_t*));
- apr_getopt_init(getopt, pool, argc, argv);
- getopt-interleave = 1;
+ apr_getopt_init(opts, pool, argc, argv);
+ opts-interleave = 1;
while (1)
{
int opt;
const char *arg;
const char *opt_arg;
- apr_status_t status = apr_getopt_long(getopt, options, opt, arg);
+ apr_status_t status = apr_getopt_long(opts, options, opt, arg);
if (APR_STATUS_IS_EOF(status))
break;
if (status != APR_SUCCESS)
@@ -957,7 +957,7 @@ main(int argc, const char **argv)
no_auth_cache = TRUE;
break;
case version_opt:
- SVN_INT_ERR(display_version(getopt, pool));
+ SVN_INT_ERR(display_version(opts, pool));
exit(EXIT_SUCCESS);
break;
case 'h':
@@ -968,10 +968,10 @@ main(int argc, const char **argv)
/* Copy the rest of our command-line arguments to an array,
UTF-8-ing them along the way. */
- action_args = apr_array_make(pool, getopt-argc, sizeof(const char *));
- while (getopt-ind getopt-argc)
+ action_args = apr_array_make(pool, opts-argc, sizeof(const char *));
+ while (opts-ind opts-argc)
{
- const char *arg = getopt-argv[getopt-ind++];
+ const char *arg = opts-argv[opts-ind++];
if ((err = svn_utf_cstring_to_utf8((APR_ARRAY_PUSH(action_args,
const char *)),
arg, pool)))
svn commit: r1239553 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/deprecated.c libsvn_client/diff.c svn/cl.h svn/diff-cmd.c svn/log-cmd.c svn/main.c
Author: stsp Date: Thu Feb 2 11:35:09 2012 New Revision: 1239553 URL: http://svn.apache.org/viewvc?rev=1239553view=rev Log: Add --no-diff-properties and --patch options to 'svn diff'. The --patch option implies --no-diff-properties and --show-copies-as-adds. These options are useful when creating patches for consumers that do not understand or do not care about Subversion properties. Patch by: Alexey Neyman sti...@att.net * subversion/svn/cl.h * subversion/svn/main.c New options, --no-diff-properties and --patch for svn diff. * subversion/include/svn_client.h (svn_client_diff6,svn_client_diff_peg6): New argument, ignore_prop_diff. (svn_client_diff5,svn_client_diff_peg5): Update comments. * subversion/libsvn_client/deprecated.c (svn_client_diff5,svn_client_diff_peg5): Pass FALSE as ignore_prop_diff. * subversion/libsvn_client/diff.c (diff_cmd_baton): New field, ignore_prop_diff. (diff_props_changed): Do nothing if diff_cmd_baton-ignore_prop_diff is set. (svn_client_diff6,svn_client_diff_peg6): Pass ignore_prop_diff downstream via diff_cmd_baton. * subversion/svn/diff-cmd.c (svn_cl__diff): Handle --patch and --no-diff-properties. * subversion/svn/log-cmd.c (log_entry_receiver): Request property changes from svn_client_diff6. Modified: subversion/trunk/subversion/include/svn_client.h subversion/trunk/subversion/libsvn_client/deprecated.c subversion/trunk/subversion/libsvn_client/diff.c subversion/trunk/subversion/svn/cl.h subversion/trunk/subversion/svn/diff-cmd.c subversion/trunk/subversion/svn/log-cmd.c subversion/trunk/subversion/svn/main.c Modified: subversion/trunk/subversion/include/svn_client.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1239553r1=1239552r2=1239553view=diff == --- subversion/trunk/subversion/include/svn_client.h (original) +++ subversion/trunk/subversion/include/svn_client.h Thu Feb 2 11:35:09 2012 @@ -2877,6 +2877,7 @@ svn_client_diff6(const apr_array_header_ svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, + svn_boolean_t ignore_prop_diff, svn_boolean_t use_git_diff_format, const char *header_encoding, svn_stream_t *outstream, @@ -2886,7 +2887,8 @@ svn_client_diff6(const apr_array_header_ apr_pool_t *pool); /** Similar to svn_client_diff6(), but with @a outfile and @a errfile, - * instead of @a outstream and @a errstream. + * instead of @a outstream and @a errstream, and always showing property + * changes. * * @deprecated Provided for backward compatibility with the 1.7 API. * @since New in 1.7. @@ -3035,6 +3037,7 @@ svn_client_diff_peg6(const apr_array_hea svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, + svn_boolean_t ignore_prop_diff, svn_boolean_t use_git_diff_format, const char *header_encoding, svn_stream_t *outstream, @@ -3044,7 +3047,8 @@ svn_client_diff_peg6(const apr_array_hea apr_pool_t *pool); /** Similar to svn_client_diff_peg6(), but with @a outfile and @a errfile, - * instead of @a outstream and @a errstream. + * instead of @a outstream and @a errstream, and always showing property + * changes. * * @deprecated Provided for backward compatibility with the 1.7 API. * @since New in 1.7. Modified: subversion/trunk/subversion/libsvn_client/deprecated.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1239553r1=1239552r2=1239553view=diff == --- subversion/trunk/subversion/libsvn_client/deprecated.c (original) +++ subversion/trunk/subversion/libsvn_client/deprecated.c Thu Feb 2 11:35:09 2012 @@ -864,7 +864,7 @@ svn_client_diff5(const apr_array_header_ return svn_client_diff6(diff_options, path1, revision1, path2, revision2, relative_to_dir, depth, ignore_ancestry, no_diff_deleted, - show_copies_as_adds, ignore_content_type, + show_copies_as_adds, ignore_content_type, FALSE, use_git_diff_format, header_encoding, outstream, errstream, changelists, ctx, pool); } @@ -992,6 +992,7 @@ svn_client_diff_peg5(const apr_array_hea no_diff_deleted, show_copies_as_adds, ignore_content_type, + FALSE, use_git_diff_format,
svn commit: r1239561 - /subversion/trunk/subversion/svn/main.c
Author: stsp
Date: Thu Feb 2 11:54:08 2012
New Revision: 1239561
URL: http://svn.apache.org/viewvc?rev=1239561view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Rename the new svn diff --patch option to
--patch-compatible. Update the help text to make the meaning
of this option a bit clearer.
Modified:
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1239561r1=1239560r2=1239561view=diff
==
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Thu Feb 2 11:54:08 2012
@@ -347,12 +347,13 @@ const apr_getopt_option_t svn_cl__option
N_(override diff-cmd specified in config file)},
{git, opt_use_git_diff_format, 0,
N_(use git's extended diff format)},
- {patch, opt_use_patch_diff_format, 0,
- N_(generate diff suitable for GNU patch;\n
+ {patch-compatible, opt_use_patch_diff_format, 0,
+ N_(generate diff suitable for generic third-party\n
- implies show-copies-as-adds and ignores property\n
+ patch tools; implies --show-copies-as-adds and\n
- differences)},
+ --no-diff-properties\n
+ )},
{allow-mixed-revisions, opt_allow_mixed_revisions, 0,
N_(Allow merge into mixed-revision working copy.\n
svn commit: r1239564 - /subversion/trunk/CHANGES
Author: stsp Date: Thu Feb 2 12:02:32 2012 New Revision: 1239564 URL: http://svn.apache.org/viewvc?rev=1239564view=rev Log: * CHANGES: Note new 'svn diff' options. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1239564r1=1239563r2=1239564view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Thu Feb 2 12:02:32 2012 @@ -17,6 +17,8 @@ http://svn.apache.org/repos/asf/subversi * support GPG agent for password storage on UNIX-like platforms (r1150783) * new 'svnadmin lock' / 'svnadmin unlock' subcommands (issue #3942, #4092) * new SVNUseUTF8 configuration option for mod_dav_svn (issue #2487) +* new --no-diff-properties option for 'svn diff' (r1239553) +* new --patch-compatible option for 'svn diff' (rr1239561) - Client-side bugfixes: *
New attachment added to page SvnMergeTheory on Subversion Wiki
Dear Wiki user, You have subscribed to a wiki page SvnMergeTheory for change notification. An attachment has been added to that page by JulianFoad. Following detailed information is available: Attachment name: merge-reint-1.png Attachment size: 32673 Attachment link: http://wiki.apache.org/subversion/SvnMergeTheory?action=AttachFiledo=gettarget=merge-reint-1.png Page link: http://wiki.apache.org/subversion/SvnMergeTheory
New attachment added to page SvnMergeTheory on Subversion Wiki
Dear Wiki user, You have subscribed to a wiki page SvnMergeTheory for change notification. An attachment has been added to that page by JulianFoad. Following detailed information is available: Attachment name: merge-reint-1.txt Attachment size: 374 Attachment link: http://wiki.apache.org/subversion/SvnMergeTheory?action=AttachFiledo=gettarget=merge-reint-1.txt Page link: http://wiki.apache.org/subversion/SvnMergeTheory
svn commit: r1239566 - /subversion/trunk/CHANGES
Author: stsp Date: Thu Feb 2 12:04:31 2012 New Revision: 1239566 URL: http://svn.apache.org/viewvc?rev=1239566view=rev Log: * CHANGES: typo Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1239566r1=1239565r2=1239566view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Thu Feb 2 12:04:31 2012 @@ -18,7 +18,7 @@ http://svn.apache.org/repos/asf/subversi * new 'svnadmin lock' / 'svnadmin unlock' subcommands (issue #3942, #4092) * new SVNUseUTF8 configuration option for mod_dav_svn (issue #2487) * new --no-diff-properties option for 'svn diff' (r1239553) -* new --patch-compatible option for 'svn diff' (rr1239561) +* new --patch-compatible option for 'svn diff' (r1239561) - Client-side bugfixes: *
svn commit: r1239570 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh Date: Thu Feb 2 12:14:17 2012 New Revision: 1239570 URL: http://svn.apache.org/viewvc?rev=1239570view=rev Log: * tools/dist/backport.pl (merge): Don't run sh in debugging mode. Modified: subversion/trunk/tools/dist/backport.pl Modified: subversion/trunk/tools/dist/backport.pl URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239570r1=1239569r2=1239570view=diff == --- subversion/trunk/tools/dist/backport.pl (original) +++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 12:14:17 2012 @@ -114,7 +114,7 @@ else fi EOF - open SHELL, '|-', qw#/bin/sh -x# or die $!; + open SHELL, '|-', qw#/bin/sh#, ($WET_RUN ? () : '-x') or die $!; print SHELL $script; close SHELL or warn $0: sh($?): $!;
svn commit: r1239574 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Author: stsp Date: Thu Feb 2 12:24:53 2012 New Revision: 1239574 URL: http://svn.apache.org/viewvc?rev=1239574view=rev Log: Follow-up to r1239553: Fix JavaHL build. * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::Diff): Pass FALSE for the new ignore_prop_diff parameter of svn_client_diff6 and svn_client_diff_peg6(). While here, add comments identifying the use_git_diff_format parameter. Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1239574r1=1239573r2=1239574view=diff == --- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original) +++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Feb 2 12:24:53 2012 @@ -971,7 +971,8 @@ void SVNClient::diff(const char *target1 noDiffDelete, showCopiesAsAdds, force, - FALSE, + FALSE, /* ignore_prop_diff */ + FALSE, /* use_git_diff_format */ SVN_APR_LOCALE_CHARSET, outputStream.getStream(subPool), NULL /* error file */, @@ -997,7 +998,8 @@ void SVNClient::diff(const char *target1 noDiffDelete, showCopiesAsAdds, force, - FALSE, + FALSE, /* ignore_prop_diff */ + FALSE, /* use_git_diff_format */ SVN_APR_LOCALE_CHARSET, outputStream.getStream(subPool), NULL /* error stream */,
svn commit: r1239595 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Thu Feb 2 13:08:23 2012
New Revision: 1239595
URL: http://svn.apache.org/viewvc?rev=1239595view=rev
Log:
* tools/dist/backport.pl
(handle_entry): Skip vetoed entries in batch mode.
Modified:
subversion/trunk/tools/dist/backport.pl
Modified: subversion/trunk/tools/dist/backport.pl
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239595r1=1239594r2=1239595view=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 13:08:23 2012
@@ -180,6 +180,7 @@ sub parse_entry {
sub handle_entry {
my %entry = parse_entry @_;
+ my @vetoes = grep { /^ -1:/ } @{$entry{votes}};
print ;
print \n The $entry{header}:;
@@ -190,11 +191,11 @@ sub handle_entry {
print ;
print for @{$entry{votes}};
print ;
- print Vetoes found! if grep { /^ -1:/ } @{$entry{votes}};
+ print Vetoes found! if @vetoes;
# TODO: this changes ./STATUS, which we're reading below, but
# on my system the loop in main() doesn't seem to care.
- merge %entry if $ENV{YES} or prompt;
+ merge %entry if $ENV{YES} ? !@vetoes : prompt;
1;
}
svn commit: r1239596 - /subversion/trunk/subversion/mod_dav_svn/liveprops.c
Author: philip
Date: Thu Feb 2 13:09:05 2012
New Revision: 1239596
URL: http://svn.apache.org/viewvc?rev=1239596view=rev
Log:
When asked for all liveprops mod_dav_svn should not send ###error###
as the checksum for a directory.
* subversion/mod_dav_svn/liveprops.c
(insert_prop_internal): Return DAV_PROP_INSERT_NOTSUPP when asked for
the MD5 checksum of a node that is not a file
Modified:
subversion/trunk/subversion/mod_dav_svn/liveprops.c
Modified: subversion/trunk/subversion/mod_dav_svn/liveprops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/liveprops.c?rev=1239596r1=1239595r2=1239596view=diff
==
--- subversion/trunk/subversion/mod_dav_svn/liveprops.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/liveprops.c Thu Feb 2 13:09:05 2012
@@ -665,12 +665,16 @@ insert_prop_internal(const dav_resource
|| resource-type == DAV_RESOURCE_TYPE_WORKING
|| resource-type == DAV_RESOURCE_TYPE_VERSION))
{
+ svn_node_kind_t kind;
svn_checksum_t *checksum;
- serr = svn_fs_file_checksum(checksum, svn_checksum_md5,
- resource-info-root.root,
- resource-info-repos_path, TRUE,
- scratch_pool);
+ serr = svn_fs_check_path(kind, resource-info-root.root,
+ resource-info-repos_path, scratch_pool);
+ if (!serr kind == svn_node_file)
+serr = svn_fs_file_checksum(checksum, svn_checksum_md5,
+resource-info-root.root,
+resource-info-repos_path, TRUE,
+scratch_pool);
if (serr != NULL)
{
ap_log_rerror(APLOG_MARK, APLOG_ERR, serr-apr_err,
@@ -684,6 +688,9 @@ insert_prop_internal(const dav_resource
break;
}
+ if (kind != svn_node_file)
+return DAV_PROP_INSERT_NOTSUPP;
+
value = svn_checksum_to_cstring(checksum, scratch_pool);
if (! value)
Re: svn commit: r1239553 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/deprecated.c libsvn_client/diff.c svn/cl.h svn/diff-cmd.c svn/log-cmd.c svn/main.c
On Thu, Feb 2, 2012 at 5:35 AM, s...@apache.org wrote: Author: stsp Date: Thu Feb 2 11:35:09 2012 New Revision: 1239553 URL: http://svn.apache.org/viewvc?rev=1239553view=rev Log: Add --no-diff-properties and --patch options to 'svn diff'. The --patch option implies --no-diff-properties and --show-copies-as-adds. Bikeshed: since the fact that we are using diff is implied by the subcommand, would it be reasonable to use a more generic option name, such as '--ignore-props' instead of '--no-diff-properties'. It is shorter firstly, and second it could be reused for other options, such as log, or event commit. I agree about the utility of the feature in general. -Hyrum -- uberSVN: Apache Subversion Made Easy http://www.uberSVN.com/
svn commit: r1239609 - /subversion/trunk/subversion/svn/main.c
Author: stsp
Date: Thu Feb 2 13:29:26 2012
New Revision: 1239609
URL: http://svn.apache.org/viewvc?rev=1239609view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Explicitly state that --patch-compatible is currently
the same as --show-copies-as-adds --no-diff-properties.
Suggested by: julianfoad
Modified:
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1239609r1=1239608r2=1239609view=diff
==
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Thu Feb 2 13:29:26 2012
@@ -350,9 +350,9 @@ const apr_getopt_option_t svn_cl__option
{patch-compatible, opt_use_patch_diff_format, 0,
N_(generate diff suitable for generic third-party\n
- patch tools; implies --show-copies-as-adds and\n
+ patch tools; currently the same as\n
- --no-diff-properties\n
+ --show-copies-as-adds --no-diff-properties\n
)},
{allow-mixed-revisions, opt_allow_mixed_revisions, 0,
N_(Allow merge into mixed-revision working copy.\n
Re: svn commit: r1239553 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/deprecated.c libsvn_client/diff.c svn/cl.h svn/diff-cmd.c svn/log-cmd.c svn/main.c
On Thu, Feb 02, 2012 at 07:13:46AM -0600, Hyrum K Wright wrote: Bikeshed: since the fact that we are using diff is implied by the subcommand, would it be reasonable to use a more generic option name, such as '--ignore-props' instead of '--no-diff-properties'. It is shorter firstly, and second it could be reused for other options, such as log, or event commit. I agree about the utility of the feature in general. The name was based on --no-diff-deleted. I agree that --ignore-props would be good, too.
svn commit: r1239614 - /subversion/branches/1.7.x/STATUS
Author: danielsh Date: Thu Feb 2 13:40:20 2012 New Revision: 1239614 URL: http://svn.apache.org/viewvc?rev=1239614view=rev Log: * STATUS: Move r1221767 to approved (with cmpilato's +1 over IRC). 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=1239614r1=1239613r2=1239614view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 13:40:20 2012 @@ -67,16 +67,6 @@ Candidate changes: Votes: -0: rhuijben (Behavior change without positive votes? 1.8?) - * r1221767, r1221780 - Fix SVNParentPath listings for parent paths which contain symlinks. - This was supposed to have been fixed by r1132782, but that solution - had problems of its own. - Notes: - r1221767 is code formatting only, needed to avoid a conflict - Votes: - +1: cmpilato (r1221780 only) - +1: philip, rhuijben - * r1235831, r1236099 Tweak the parsing of the ssl-authority-files config option to make it easier for users to configure. @@ -173,3 +163,13 @@ Veto-blocked changes: Approved changes: = + + * r1221767, r1221780 + Fix SVNParentPath listings for parent paths which contain symlinks. + This was supposed to have been fixed by r1132782, but that solution + had problems of its own. + Notes: + r1221767 is code formatting only, needed to avoid a conflict + Votes: + +1: cmpilato, philip, rhuijben +
svn commit: r1239616 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_repos/rev_hunt.c subversion/mod_dav_svn/repos.c
Author: danielsh Date: Thu Feb 2 13:43:43 2012 New Revision: 1239616 URL: http://svn.apache.org/viewvc?rev=1239616view=rev Log: Merge the r1221767 group from trunk: * r1221767, r1221780 Fix SVNParentPath listings for parent paths which contain symlinks. This was supposed to have been fixed by r1132782, but that solution had problems of its own. Notes: r1221767 is code formatting only, needed to avoid a conflict Votes: +1: cmpilato, philip, rhuijben Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_repos/rev_hunt.c subversion/branches/1.7.x/subversion/mod_dav_svn/repos.c Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 2 13:43:43 2012 @@ -74,4 +74,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,1150344,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,115 6085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207656,1207663,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,12207 42,1220750,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-123,1232413,1235264,1235296,1235302,1235736,1236163,1236283,1236343
svn commit: r1239617 - in /subversion/trunk/subversion/svn: cl.h diff-cmd.c main.c
Author: stsp
Date: Thu Feb 2 13:46:11 2012
New Revision: 1239617
URL: http://svn.apache.org/viewvc?rev=1239617view=rev
Log:
Rename the new --no-diff-properties option to --ignore-properties.
This allows the option to be re-used by other subcommands in the future.
Suggested by: hwright
* subversion/svn/cl.h
(svn_cl__opt_state_t): Rename no_diff_props to ignore_props.
* subversion/svn/main.c
(svn_cl__longopt_t, svn_cl__cmd_table): Rename opt_no_diff_props to
opt_ignore_props.
(svn_cl__options): Rename --no-diff-properties to --ignore-properties
and update a reference to the old name in the help text of 'svn diff'.
(main): Track renamed fields.
* subversion/svn/diff-cmd.c
(svn_cl__diff): Track renamed fields.
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/diff-cmd.c
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/cl.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1239617r1=1239616r2=1239617view=diff
==
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Thu Feb 2 13:46:11 2012
@@ -184,7 +184,7 @@ typedef struct svn_cl__opt_state_t
svn_boolean_t no_ignore; /* disregard default ignores svn:ignore's */
svn_boolean_t no_auth_cache; /* do not cache authentication information */
svn_boolean_t no_diff_deleted; /* do not show diffs for deleted files */
- svn_boolean_t no_diff_props; /* do not show diffs for properties */
+ svn_boolean_t ignore_props;/* ignore properties */
svn_boolean_t show_copies_as_adds; /* do not diff copies with their source */
svn_boolean_t notice_ancestry; /* notice ancestry for diff-y operations */
svn_boolean_t ignore_ancestry; /* ignore ancestry for merge-y operations */
Modified: subversion/trunk/subversion/svn/diff-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/diff-cmd.c?rev=1239617r1=1239616r2=1239617view=diff
==
--- subversion/trunk/subversion/svn/diff-cmd.c (original)
+++ subversion/trunk/subversion/svn/diff-cmd.c Thu Feb 2 13:46:11 2012
@@ -174,7 +174,7 @@ svn_cl__diff(apr_getopt_t *os,
svn_boolean_t show_copies_as_adds =
opt_state-use_patch_diff_format ? TRUE : opt_state-show_copies_as_adds;
svn_boolean_t ignore_prop_diff =
-opt_state-use_patch_diff_format ? TRUE : opt_state-no_diff_props;
+opt_state-use_patch_diff_format ? TRUE : opt_state-ignore_props;
int i;
const svn_client_diff_summarize_func_t summarize_func =
(opt_state-xml ? summarize_xml : summarize_regular);
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1239617r1=1239616r2=1239617view=diff
==
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Thu Feb 2 13:46:11 2012
@@ -89,7 +89,7 @@ typedef enum svn_cl__longopt_t {
opt_no_auth_cache,
opt_no_autoprops,
opt_no_diff_deleted,
- opt_no_diff_props,
+ opt_ignore_props,
opt_no_ignore,
opt_no_unlock,
opt_non_interactive,
@@ -241,8 +241,8 @@ const apr_getopt_option_t svn_cl__option
N_(try operation but make no changes)},
{no-diff-deleted, opt_no_diff_deleted, 0,
N_(do not print differences for deleted files)},
- {no-diff-properties, opt_no_diff_props, 0,
-N_(do not print differences for properties)},
+ {ignore-properties, opt_ignore_props, 0,
+N_(ignore properties during the operation)},
{notice-ancestry, opt_notice_ancestry, 0,
N_(notice ancestry when calculating differences)},
{ignore-ancestry, opt_ignore_ancestry, 0,
@@ -352,7 +352,7 @@ const apr_getopt_option_t svn_cl__option
patch tools; currently the same as\n
- --show-copies-as-adds --no-diff-properties\n
+ --show-copies-as-adds --ignore-properties\n
)},
{allow-mixed-revisions, opt_allow_mixed_revisions, 0,
N_(Allow merge into mixed-revision working copy.\n
@@ -549,7 +549,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
\n
Use just 'svn diff' to display local modifications in a working
copy.\n),
{'r', 'c', opt_old_cmd, opt_new_cmd, 'N', opt_depth, opt_diff_cmd,
- opt_internal_diff, 'x', opt_no_diff_deleted, opt_no_diff_props,
+ opt_internal_diff, 'x', opt_no_diff_deleted, opt_ignore_props,
opt_show_copies_as_adds, opt_notice_ancestry, opt_summarize,
opt_changelist,
opt_force, opt_xml, opt_use_git_diff_format,
svn commit: r1239619 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Thu Feb 2 13:54:14 2012
New Revision: 1239619
URL: http://svn.apache.org/viewvc?rev=1239619view=rev
Log:
* tools/dist/backport.pl
(merge): Correct use of $WET_RUN.
Modified:
subversion/trunk/tools/dist/backport.pl
Modified: subversion/trunk/tools/dist/backport.pl
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239619r1=1239618r2=1239619view=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 13:54:14 2012
@@ -91,6 +91,9 @@ sub merge {
my $script = EOF;
#!/bin/sh
set -e
+if $WET_RUN; then
+ set -x
+fi
$SVN diff $backupfile
$SVN revert -R .
$SVN up
@@ -114,7 +117,7 @@ else
fi
EOF
- open SHELL, '|-', qw#/bin/sh#, ($WET_RUN ? () : '-x') or die $!;
+ open SHELL, '|-', qw#/bin/sh# or die $!;
print SHELL $script;
close SHELL or warn $0: sh($?): $!;
svn commit: r1239624 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Thu Feb 2 14:04:27 2012
New Revision: 1239624
URL: http://svn.apache.org/viewvc?rev=1239624view=rev
Log:
* tools/dist/backport.pl
(handle_entry): Cleanly separate the 'Always-yes' and interactive cases,
with the side effect of not printing in the former.
Modified:
subversion/trunk/tools/dist/backport.pl
Modified: subversion/trunk/tools/dist/backport.pl
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239624r1=1239623r2=1239624view=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 14:04:27 2012
@@ -185,20 +185,25 @@ sub handle_entry {
my %entry = parse_entry @_;
my @vetoes = grep { /^ -1:/ } @{$entry{votes}};
- print ;
- print \n The $entry{header}:;
- print join , , map { r$_ } @{$entry{revisions}};
- print $BRANCHES/$entry{branch} if $entry{branch};
- print ;
- print for @{$entry{logsummary}};
- print ;
- print for @{$entry{votes}};
- print ;
- print Vetoes found! if @vetoes;
+ if ($ENV{YES}) {
+merge %entry unless @vetoes;
+ } else {
+print ;
+print \n The $entry{header}:;
+print join , , map { r$_ } @{$entry{revisions}};
+print $BRANCHES/$entry{branch} if $entry{branch};
+print ;
+print for @{$entry{logsummary}};
+print ;
+print for @{$entry{votes}};
+print ;
+print Vetoes found! if @vetoes;
- # TODO: this changes ./STATUS, which we're reading below, but
+merge %entry if prompt;
+ }
+
+ # TODO: merge() changes ./STATUS, which we're reading below, but
# on my system the loop in main() doesn't seem to care.
- merge %entry if $ENV{YES} ? !@vetoes : prompt;
1;
}
svn commit: r1239631 - /subversion/trunk/subversion/libsvn_client/commit_util.c
Author: stsp Date: Thu Feb 2 14:11:29 2012 New Revision: 1239631 URL: http://svn.apache.org/viewvc?rev=1239631view=rev Log: * subversion/libsvn_client/commit_util.c (harvest_committables): Improve documentation for the DANGLERS parameter by pointing to the place where the term dangler is defined, instead of trying to explain the concept in a short and possibly misleading sentence. Modified: subversion/trunk/subversion/libsvn_client/commit_util.c Modified: subversion/trunk/subversion/libsvn_client/commit_util.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1239631r1=1239630r2=1239631view=diff == --- subversion/trunk/subversion/libsvn_client/commit_util.c (original) +++ subversion/trunk/subversion/libsvn_client/commit_util.c Thu Feb 2 14:11:29 2012 @@ -417,8 +417,8 @@ bail_on_tree_conflicted_ancestor(svn_wc_ externals that aren't explicit commit targets.) DANGLERS is a hash table mapping const char* absolute paths of a parent - that must be committed to a const char * absolute path of a child that - needs them. + to a const char * absolute path of a child. See the comment about + danglers at the top of svn_client__harvest_committables(). If CANCEL_FUNC is non-null, call it with CANCEL_BATON to see if the user has cancelled the operation.
svn commit: r1239639 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Thu Feb 2 14:19:39 2012
New Revision: 1239639
URL: http://svn.apache.org/viewvc?rev=1239639view=rev
Log:
* tools/dist/backport.pl
(feature): Use 'switch' and 'say'. This requires Perl 5.10.
(main): Rewrite using switch(). Don't print in batch mode.
Modified:
subversion/trunk/tools/dist/backport.pl
Modified: subversion/trunk/tools/dist/backport.pl
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239639r1=1239638r2=1239639view=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 14:19:39 2012
@@ -1,6 +1,7 @@
#!/usr/bin/perl -l
use warnings;
use strict;
+use feature qw/switch say/;
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -217,14 +218,22 @@ sub main {
while () {
my @lines = split /\n/;
-# Section header?
+# Skip most of the file
next unless $sawapproved ||= /^Approved changes/;
-print \n\n=== $lines[0] and next if $lines[0] =~ /^[A-Z].*:$/i;
-# Backport entry?
-handle_entry @lines and next if $lines[0] =~ /^ \*/ and $sawapproved;
-
-warn Unknown entry '$lines[0]' at $ARGV:$.\n;
+given ($lines[0]) {
+ # Section header
+ when (/^[A-Z].*:$/i) {
+print \n\n=== $lines[0] unless $ENV{YES};
+ }
+ # Backport entry?
+ when (/^ \*/) {
+handle_entry @lines if $sawapproved;
+ }
+ default {
+warn Unknown entry '$lines[0]' at $ARGV:$.\n;
+ }
+}
}
}
Re: svn commit: r1239617 - in /subversion/trunk/subversion/svn: cl.h diff-cmd.c main.c
On Thu, Feb 2, 2012 at 7:46 AM, s...@apache.org wrote: Author: stsp Date: Thu Feb 2 13:46:11 2012 New Revision: 1239617 URL: http://svn.apache.org/viewvc?rev=1239617view=rev Log: Rename the new --no-diff-properties option to --ignore-properties. This allows the option to be re-used by other subcommands in the future. Looks good. Thanks! -Hyrum
svn commit: r1239645 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Thu Feb 2 14:29:20 2012
New Revision: 1239645
URL: http://svn.apache.org/viewvc?rev=1239645view=rev
Log:
Add a 'Be noisy?' knob, defaulting to no. It is separate from the
'Batch mode' knob.
* tools/dist/backport.pl
($DEBUG, $SVNq): New globals.
(merge): Produce output only in debug mode.
Modified:
subversion/trunk/tools/dist/backport.pl
Modified: subversion/trunk/tools/dist/backport.pl
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239645r1=1239644r2=1239645view=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 14:29:20 2012
@@ -30,6 +30,9 @@ my $VIM = 'vim';
my $STATUS = './STATUS';
my $BRANCHES = '^/subversion/branches';
my $WET_RUN = qw[false true][1]; # don't commit
+my $DEBUG = qw[false true][0]; # 'set -x', etc
+my $SVNq = $SVN -q ;
+$SVNq =~ s/-q// if $DEBUG eq 'true';
sub usage {
my $basename = $0;
@@ -92,16 +95,16 @@ sub merge {
my $script = EOF;
#!/bin/sh
set -e
-if $WET_RUN; then
+if $DEBUG; then
set -x
fi
$SVN diff $backupfile
-$SVN revert -R .
-$SVN up
-$SVN merge $mergeargs
+$SVNq revert -R .
+$SVNq up
+$SVNq merge $mergeargs
$VIM -e -s -n -N -i NONE -u NONE -c '/$pattern/normal! dap' -c wq $STATUS
if $WET_RUN; then
- $SVN commit -F $logmsg_filename
+ $SVNq commit -F $logmsg_filename
else
echo Committing:
$SVN status -q
@@ -112,7 +115,7 @@ EOF
$script .= EOF if $entry{branch};
reinteg_rev=\`$SVN info $STATUS | sed -ne 's/Last Changed Rev: //p'\`
if $WET_RUN; then
- $SVN rm $BRANCHES/$entry{branch} -m Remove the '$entry{branch}' branch,
reintegrated in r\$reinteg_rev.
+ $SVNq rm $BRANCHES/$entry{branch} -m Remove the '$entry{branch}' branch,
reintegrated in r\$reinteg_rev.
else
echo Removing reintegrated '$entry{branch}' branch
fi
svn commit: r1239646 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Thu Feb 2 14:32:00 2012
New Revision: 1239646
URL: http://svn.apache.org/viewvc?rev=1239646view=rev
Log:
* tools/dist/backport.pl
($YES): New global for 'batch mode'. Use it instead of random getenv() calls.
Modified:
subversion/trunk/tools/dist/backport.pl
Modified: subversion/trunk/tools/dist/backport.pl
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239646r1=1239645r2=1239646view=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 14:32:00 2012
@@ -29,6 +29,8 @@ my $SVN = $ENV{SVN} || 'svn'; # passed u
my $VIM = 'vim';
my $STATUS = './STATUS';
my $BRANCHES = '^/subversion/branches';
+
+my $YES = $ENV{YES}; # batch mode: assume 'yes' without asking
my $WET_RUN = qw[false true][1]; # don't commit
my $DEBUG = qw[false true][0]; # 'set -x', etc
my $SVNq = $SVN -q ;
@@ -189,7 +191,7 @@ sub handle_entry {
my %entry = parse_entry @_;
my @vetoes = grep { /^ -1:/ } @{$entry{votes}};
- if ($ENV{YES}) {
+ if ($YES) {
merge %entry unless @vetoes;
} else {
print ;
@@ -227,7 +229,7 @@ sub main {
given ($lines[0]) {
# Section header
when (/^[A-Z].*:$/i) {
-print \n\n=== $lines[0] unless $ENV{YES};
+print \n\n=== $lines[0] unless $YES;
}
# Backport entry?
when (/^ \*/) {
svn commit: r1239650 - /subversion/branches/1.7.x/STATUS
Author: philip Date: Thu Feb 2 14:42:27 2012 New Revision: 1239650 URL: http://svn.apache.org/viewvc?rev=1239650view=rev Log: * STATUS: Add r1239596. 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=1239650r1=1239649r2=1239650view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 14:42:27 2012 @@ -109,7 +109,7 @@ Candidate changes: +1: stsp (without r1239382) +1: rhuijben - * r1237720 + * r1237720, r1239596 Log errors instead of ignoring them. Justification: Ignoring errors is bad. @@ -118,8 +118,10 @@ Candidate changes: log entries for every serf checkout. (This is separate from http://subversion.apache.org/docs/release-notes/1.7#serf, which has to do with the access log.) + r1239596 avoids suprious log messages for directory checksums. Votes: - +1: danielsh, rhuijben + +1: danielsh, rhuijben (r1237720 only) + +1: philip * r1238121 Fix incorrect url construction in libsvn_ra_serf when svn_ra_get_dir2() is
svn commit: r1239652 - /subversion/trunk/tools/dev/merge-graph.py
Author: julianfoad
Date: Thu Feb 2 14:48:15 2012
New Revision: 1239652
URL: http://svn.apache.org/viewvc?rev=1239652view=rev
Log:
Teach merge-graph.py to allow multiple annotations on the same node, and
make some minor formatting changes.
Modified:
subversion/trunk/tools/dev/merge-graph.py
Modified: subversion/trunk/tools/dev/merge-graph.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/merge-graph.py?rev=1239652r1=1239651r2=1239652view=diff
==
--- subversion/trunk/tools/dev/merge-graph.py (original)
+++ subversion/trunk/tools/dev/merge-graph.py Thu Feb 2 14:48:15 2012
@@ -22,6 +22,8 @@
args_message = 'GRAPH_CONFIG_FILE...'
help_message = Produce pretty graphs representing branches and merging.
For each config file specified, construct a graph and write it as a PNG
file.
+
+# Config file format:
example =
[graph]
filename = merge-sync-1.png
@@ -93,19 +95,21 @@ class MergeGraph(pydot.Graph):
Base class, not intended for direct use. Use MergeDot for the main
graph and MergeSubgraph for a subgraph.
- def mk_origin_node(graph, name):
+ def mk_origin_node(graph, name, label):
Add a node to the graph
-graph.add_node(Node(name + '0', label=name, shape='plaintext'))
+graph.add_node(Node(name, label=label, shape='plaintext'))
def mk_invis_node(graph, name):
Add a node to the graph
graph.add_node(Node(name, style='invis'))
- def mk_node(graph, name):
+ def mk_node(graph, name, label=None):
Add a node to the graph, if not already present
if not graph.get_node(name):
+ if not label:
+label = name
if name in graph.changes:
-graph.add_node(Node(name))
+graph.add_node(Node(name, label=label))
else:
graph.add_node(Node(name, color='grey', label=''))
@@ -138,8 +142,6 @@ class MergeGraph(pydot.Graph):
style='bold')
if kind == 'cherry':
e.set_style('dashed')
- e.set_dir('both')
- e.set_arrowtail('tee')
graph.add_edge(e)
def mk_mergeinfo_edge(graph, base_node, src_node, important):
@@ -160,7 +162,7 @@ class MergeGraph(pydot.Graph):
Add a merge
base_node, src_node, tgt_node, kind = merge
-if base_node and src_node and kind != 'cherry':
+if base_node and src_node: # and kind != 'cherry':
graph.mk_mergeinfo_edge(base_node, src_node, important)
# Merge target node
@@ -170,12 +172,29 @@ class MergeGraph(pydot.Graph):
graph.mk_merge_edge(src_node, tgt_node, kind, kind, important)
def add_annotation(graph, node, label, color='red'):
-
-ann_node = node + '_annotation'
-g = pydot.Subgraph(rank='same')
+Add a graph node that serves as an annotation to a normal node.
+ More than one annotation can be added to the same normal node.
+subg_name = node + '_annotations'
+
+def get_subgraph(graph, name):
+ Equivalent to pydot.Graph.get_subgraph() when there is no more than
+ one subgraph of the given name, but working aroung a bug in
+ pydot.Graph.get_subgraph().
+ for subg in graph.get_subgraph_list():
+if subg.get_name() == name:
+ return subg
+ return None
+
+g = get_subgraph(graph, subg_name)
+if not g:
+ g = pydot.Subgraph(subg_name, rank='same')
+ graph.add_subgraph(g)
+
+ann_node = node + '_'
+while g.get_node(ann_node):
+ ann_node = ann_node + '_'
g.add_node(Node(ann_node, shape='box', color=color, label='' + label +
''))
g.add_edge(Edge(ann_node, node, style='dotted', color=color, dir='none',
constraint='false'))
-graph.add_subgraph(g)
class MergeSubgraph(MergeGraph, pydot.Subgraph):
@@ -189,7 +208,7 @@ class MergeDot(MergeGraph, pydot.Dot):
# TODO: In the 'merges' input, find the predecessor automatically.
def __init__(graph, config_filename, **attrs):
-Return a new MergeDot graph generated from the specified config file.
+Return a new MergeDot graph generated from a config file.
MergeGraph.__init__(graph)
pydot.Dot.__init__(graph, **attrs)
@@ -198,15 +217,15 @@ class MergeDot(MergeGraph, pydot.Dot):
graph.construct()
def read_config(graph, config_filename):
-
+Initialize a MergeDot graph's input data from a config file.
import ConfigParser
config = ConfigParser.SafeConfigParser()
files_read = config.read(config_filename)
if len(files_read) == 0:
print sys.stderr, 'graph: unable to read graph config from ' +
config_filename + ''
sys.exit(1)
-graph.title = config.get('graph', 'title')
graph.filename = config.get('graph', 'filename')
+graph.title = config.get('graph', 'title')
graph.branches = eval(config.get('graph', 'branches'))
graph.changes = eval(config.get('graph', 'changes'))
graph.merges = eval(config.get('graph', 'merges'))
@@ -216,7 +235,11 @@ class MergeDot(MergeGraph,
svn commit: r1239654 - /subversion/branches/1.7.x/STATUS
Author: danielsh Date: Thu Feb 2 14:49:14 2012 New Revision: 1239654 URL: http://svn.apache.org/viewvc?rev=1239654view=rev Log: Vote for r1239596. 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=1239654r1=1239653r2=1239654view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 14:49:14 2012 @@ -120,8 +120,8 @@ Candidate changes: with the access log.) r1239596 avoids suprious log messages for directory checksums. Votes: - +1: danielsh, rhuijben (r1237720 only) - +1: philip + +1: rhuijben (r1237720 only) + +1: philip, danielsh * r1238121 Fix incorrect url construction in libsvn_ra_serf when svn_ra_get_dir2() is
svn commit: r1239656 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Thu Feb 2 14:57:15 2012 New Revision: 1239656 URL: http://svn.apache.org/viewvc?rev=1239656view=rev Log: * STATUS: Vote for r1239382. 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=1239656r1=1239655r2=1239656view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 14:57:15 2012 @@ -106,8 +106,7 @@ Candidate changes: r1227384 prepares the actual fix and needs --accept=mine-conflict r1227385 is the actual fix Votes: - +1: stsp (without r1239382) - +1: rhuijben + +1: stsp, rhuijben * r1237720, r1239596 Log errors instead of ignoring them.
svn commit: r1239659 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Thu Feb 2 15:01:57 2012 New Revision: 1239659 URL: http://svn.apache.org/viewvc?rev=1239659view=rev Log: * STATUS: Nominate r1239631 and r1239655, with Bert's +1 via IRC. 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=1239659r1=1239658r2=1239659view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 15:01:57 2012 @@ -88,7 +88,7 @@ Candidate changes: +1: philip, stsp * r1146762, r1201419, r1227237, r1227250, r1227352, r1227372, r1227384, - r1227385, r1239382 + r1227385, r1239382, r1239631, r1239655 Fix issue #4059, can't commit when copy-op-root and copied-along grandchild are explicit targets. Justification: @@ -106,6 +106,7 @@ Candidate changes: r1227384 prepares the actual fix and needs --accept=mine-conflict r1227385 is the actual fix r1239382 fixes the problem for nested copies, too + r1239631 and r1239655 are follow-up comment fixes Votes: +1: stsp, rhuijben
[Subversion Wiki] Update of InheritedProperties by pburba
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Subversion Wiki for
change notification.
The InheritedProperties page has been changed by pburba:
http://wiki.apache.org/subversion/InheritedProperties?action=diffrev1=15rev2=16
Comment:
Remove my rant/note about recursive inheritance. Looks like that is the
direction we are going in.
[2] When I say 'working node' I mean the 'topmost' version of the node in
the WC, no matter whether that is different from or the same as the base
version.
}}}
1. Note an important implication of #2 and #3: Unlike svn:mergeinfo, a child
path with the svn:inheritable:X property explicitly set on it can also inherit
the svn:inheritable:X property from a parent. Our default approach will be for
child values to simply override parent values (exactly how svn:mergeinfo works
today). However, the APIs will support getting both explicit and/or inherited
property values. So it's possbile that child values might append to parent
values or more complex merging of properties may be performed based on the
specific property.
- . {{{#!wiki note
- [PTB] Even as I write #4, it occurs to me that once we elect to move beyond
a simple override model of inheritance (i.e. the mergeinfo model: a child
with an explicit inheritable property can't inherit that property) that we
begin descending the slippery slope into madness that has thwarted all previous
attempts at inherited properties. What if a child with the explicit
svn:inheritable:X property has a parent, and a grand parent, and a
great-grand-parent, etc. with the same explicit property but different values?
The new APIs below are only dealing with the first parent encountered, which is
pretty useless.
- }}}
1. Unlike svn:mergeinfo, the property value a child inherits from a parent
will not be modified based on the path-difference between the parent and child.
The property value on the parent is the value the child will inherit. There
are no plans to provide an API which reveals the specific parent path a child
inherits from.
1. While setting inheritable properties on a file has no meaning from the
standpoint of inheritance, the property still applies to the file itself. Thus
there will be no prohibitions on setting inheritable properties on files.
1. If a child path which inherits a property is copied, the inherited
properties are not copied with it. The new destination path inherits
properties from its new parents. This means that depending on the copy
destination the new path may or may not inherit the same property, and even if
it does, it may inherit a different value. This puts the onus on users to set
their inheritable properties as close to the root of the repository tree as
makes sense for the property in question. Have a property you want to apply
to the whole repository? Set it on the root. Want it to apply only to a
single project? Set it on the root of the project. Note that if a path has an
inheritable property 'explicitly' set on it, the property is copied
just like any other versioned property.
svn commit: r1239661 - /subversion/1.7.x-issue4059/
Author: stsp Date: Thu Feb 2 15:10:09 2012 New Revision: 1239661 URL: http://svn.apache.org/viewvc?rev=1239661view=rev Log: Create a 1.7.x branch for issue #4059 fix backport. Added: subversion/1.7.x-issue4059/ (props changed) - copied from r1239660, subversion/branches/1.7.x/ Propchange: subversion/1.7.x-issue4059/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 2 15:10:09 2012 @@ -0,0 +1,2 @@ +[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+ +(\d+) Propchange: subversion/1.7.x-issue4059/ -- bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID% Propchange: subversion/1.7.x-issue4059/ -- --- svn:ignore (added) +++ svn:ignore Thu Feb 2 15:10:09 2012 @@ -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/1.7.x-issue4059/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Feb 2 15:10:09 2012 @@ -0,0 +1,77 @@ +/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-issue4032:1186668-1186784 +/subversion/branches/1.7.x-issue4035:1186202-1186315 +/subversion/branches/1.7.x-issue4035-r1185738:1186316-1186778 +/subversion/branches/1.7.x-issue4093:1229839-1230236 +/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/1.7.x-r1180154:1186224-1186351 +/subversion/branches/1.7.x-r1201824:1202121-1207333 +/subversion/branches/1.7.x-r1213331:1213684-1213756 +/subversion/branches/1.7.x-r1232221:1232358-1238008 +/subversion/branches/1.7.x-r1236343:1236628-1239394 +/subversion/branches/1.7.x-svn-patch-eol-fixes:1207511-1235924 +/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
svn commit: r1239670 - /subversion/trunk/CHANGES
Author: stsp Date: Thu Feb 2 15:25:49 2012 New Revision: 1239670 URL: http://svn.apache.org/viewvc?rev=1239670view=rev Log: * CHANGES: --no-diff-properties has been renamed to --ignore-properties Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1239670r1=1239669r2=1239670view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Thu Feb 2 15:25:49 2012 @@ -17,7 +17,7 @@ http://svn.apache.org/repos/asf/subversi * support GPG agent for password storage on UNIX-like platforms (r1150783) * new 'svnadmin lock' / 'svnadmin unlock' subcommands (issue #3942, #4092) * new SVNUseUTF8 configuration option for mod_dav_svn (issue #2487) -* new --no-diff-properties option for 'svn diff' (r1239553) +* new --ignore-properties option for 'svn diff' (r1239553. -617) * new --patch-compatible option for 'svn diff' (r1239561) - Client-side bugfixes:
svn propchange: r1239203 - svn:log
Author: stsp Revision: 1239203 Modified property: svn:log Modified: svn:log at Thu Feb 2 15:42:58 2012 -- --- svn:log (original) +++ svn:log Thu Feb 2 15:42:58 2012 @@ -42,6 +42,7 @@ repositories may contain UTF-8 character the native character set based on the current locale. * subversion/libsvn_subr/utf.c + (svn_utf_initialize2): New. (assume_native_charset_is_utf8): New global boolean variable. Defaults to FALSE, and may be set to TRUE by svn_utf_initialize2() (which, like its predecessor, is documented to not be thread-safe).
[Subversion Wiki] Update of InheritedProperties by pburba
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Subversion Wiki for
change notification.
The InheritedProperties page has been changed by pburba:
http://wiki.apache.org/subversion/InheritedProperties?action=diffrev1=16rev2=17
Comment:
Add some notes
{{{#!wiki note
[JAF] What do the keys of 'inherited_prop_hash' represent if 'path' is a
working copy path but some of the inherited properties are set on repository
paths that are above the WC root?
}}}
+ {{{#!wiki note
+ [PTB] JAF - It's a bit awkward, but I was thinking WC relative paths for
props inherited from WC parents and URLs for props inherited from the
repository (via the inherited prop cache). We obviously can't use WC keys in
all cases, but using URLs in all cases won't work either because a WC parent
might not exist in the repository due to local changes.
+ }}}
+ {{{#!wiki note
+ [PTB] Instead of using a hash mapping parent paths to a hash of
properties, it probably makes more sense to use an array of structures which
contain the path/URL and the property hash as members. The array would be
sorted by the depth of the path/URL and would allow the caller to easily
determine the nearest parent of PATH if that is all that it needs (think of a
property with a svn:mergeinfo-like straight override model of inheritance where
all that ever matters is the nearest parent).
+ }}}
+
Rev svn_client_proplist3 to svn_client_proplist4, adding the argument
svn_boolean_t '''get_target_inherited_props''':
{{{#!cplusplus
svn commit: r1239683 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/
Author: hwright
Date: Thu Feb 2 15:53:48 2012
New Revision: 1239683
URL: http://svn.apache.org/viewvc?rev=1239683view=rev
Log:
JavaHL: Punch through the ignore_props parameter for diff operations to the
Java API.
[ in subversion/bindings/javahl/ ]
* native/SVNClient.h
(diff, diff, diff): Add ignoreProps param.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2):
Rename to...
(Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2Z):
...this. Add param and handle it.
(Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2):
Rename to...
(Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2Z):
...this. Add param and handle it.
* subversion/bindings/javahl/native/SVNClient.cpp
(diff, diff, diff): Add ignoreProps param and pass it down the stack.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
(diff): Add ignoreProps param.
(diff): Pass ignoreProps as false in compat wrapper.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
(diff, diff): Add ignoreProps param.
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1239683r1=1239682r2=1239683view=diff
==
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Feb 2
15:53:48 2012
@@ -935,7 +935,7 @@ void SVNClient::diff(const char *target1
OutputStream outputStream, svn_depth_t depth,
StringArray changelists,
bool ignoreAncestry, bool noDiffDelete, bool force,
- bool showCopiesAsAdds)
+ bool showCopiesAsAdds, bool ignoreProps)
{
SVN::Pool subPool(pool);
const char *c_relToDir = relativeToDir ?
@@ -971,7 +971,7 @@ void SVNClient::diff(const char *target1
noDiffDelete,
showCopiesAsAdds,
force,
- FALSE, /* ignore_prop_diff */
+ ignoreProps,
FALSE, /* use_git_diff_format */
SVN_APR_LOCALE_CHARSET,
outputStream.getStream(subPool),
@@ -998,7 +998,7 @@ void SVNClient::diff(const char *target1
noDiffDelete,
showCopiesAsAdds,
force,
- FALSE, /* ignore_prop_diff */
+ ignoreProps,
FALSE, /* use_git_diff_format */
SVN_APR_LOCALE_CHARSET,
outputStream.getStream(subPool),
@@ -1015,11 +1015,11 @@ void SVNClient::diff(const char *target1
const char *relativeToDir, OutputStream outputStream,
svn_depth_t depth, StringArray changelists,
bool ignoreAncestry, bool noDiffDelete, bool force,
- bool showCopiesAsAdds)
+ bool showCopiesAsAdds, bool ignoreProps)
{
diff(target1, revision1, target2, revision2, NULL, relativeToDir,
outputStream, depth, changelists,
svn commit: r1239686 - /subversion/branches/1.7.x/STATUS
Author: philip Date: Thu Feb 2 16:00:52 2012 New Revision: 1239686 URL: http://svn.apache.org/viewvc?rev=1239686view=rev Log: * STATUS: Vote/approve r1237720 (rhuijben by IRC). 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=1239686r1=1239685r2=1239686view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 16:00:52 2012 @@ -109,20 +109,6 @@ Candidate changes: Votes: +1: stsp, rhuijben - * r1237720, r1239596 - Log errors instead of ignoring them. - Justification: - Ignoring errors is bad. - Notes: - Due to preexisting ra_serf behaviour, may result in many server-side error - log entries for every serf checkout. (This is separate from - http://subversion.apache.org/docs/release-notes/1.7#serf, which has to do - with the access log.) - r1239596 avoids suprious log messages for directory checksums. - Votes: - +1: rhuijben (r1237720 only) - +1: philip, danielsh - * r1238121 Fix incorrect url construction in libsvn_ra_serf when svn_ra_get_dir2() is called against a HTTPv2 server with a SVN_INVALID_REVNUM revision. @@ -166,3 +152,15 @@ Veto-blocked changes: Approved changes: = + * r1237720, r1239596 + Log errors instead of ignoring them. + Justification: + Ignoring errors is bad. + Notes: + Due to preexisting ra_serf behaviour, may result in many server-side error + log entries for every serf checkout. (This is separate from + http://subversion.apache.org/docs/release-notes/1.7#serf, which has to do + with the access log.) + r1239596 avoids suprious log messages for directory checksums with serf. + Votes: + +1: philip, danielsh, rhuijben
svn commit: r1239687 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Author: hwright Date: Thu Feb 2 16:01:18 2012 New Revision: 1239687 URL: http://svn.apache.org/viewvc?rev=1239687view=rev Log: JavaHL: Update to an un-deprecated version of an API. * subversion/bindings/javahl/native/SVNClient.cpp (propertyGet): Use svn_client_propget4(). Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1239687r1=1239686r2=1239687view=diff == --- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original) +++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Feb 2 16:01:18 2012 @@ -829,10 +829,11 @@ jbyteArray SVNClient::propertyGet(const return NULL; apr_hash_t *props; -SVN_JNI_ERR(svn_client_propget3(props, name, +SVN_JNI_ERR(svn_client_propget4(props, name, intPath.c_str(), pegRevision.revision(), revision.revision(), NULL, svn_depth_empty, -NULL, ctx, subPool.getPool()), +NULL, ctx, subPool.getPool(), +subPool.getPool()), NULL); apr_hash_index_t *hi;
svn commit: r1239688 - /subversion/branches/1.7.x/STATUS
Author: cmpilato Date: Thu Feb 2 16:03:45 2012 New Revision: 1239688 URL: http://svn.apache.org/viewvc?rev=1239688view=rev Log: Votey votey... 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=1239688r1=1239687r2=1239688view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 16:03:45 2012 @@ -24,17 +24,6 @@ Candidate changes: -0: stsp (we can backport these when we need to) -0: gstein - * r1207555, r1207808 - mod_dontdothat: contrib/ - tools/ and relicense under ALv2. - Justification: - ASF infra is using this so we should maintain it. - Stuff in contrib/ isn't officially maintained. - Notes: - r1207555: Perform the move (from r1207550) and relicense - r1207808: Enable building mod_dontdothat from our standard make scripts. - Votes: - +1: rhuijben, stsp - * r1210147, r1202132, r1202333, r1220740 Fix the 'svn log --diff' code so that it correctly shows a diff of a target file (or directory) that was at a different path in the past. @@ -53,13 +42,6 @@ Candidate changes: on Windows without it that cannot be fixed some other way?) +1: julianfoad - * r1221178, r1221303 - Fix issue 4086, mod_dav_svn's handling of POST errors. - Justification: - Regression when using the v2 protocol. - Votes: - +1: philip, rhuijben - * r1221463 Allow leading r in ?p= query string arguments. Justification: @@ -152,6 +134,24 @@ Veto-blocked changes: Approved changes: = + * r1207555, r1207808 + mod_dontdothat: contrib/ - tools/ and relicense under ALv2. + Justification: + ASF infra is using this so we should maintain it. + Stuff in contrib/ isn't officially maintained. + Notes: + r1207555: Perform the move (from r1207550) and relicense + r1207808: Enable building mod_dontdothat from our standard make scripts. + Votes: + +1: rhuijben, stsp, cmpilato + + * r1221178, r1221303 + Fix issue 4086, mod_dav_svn's handling of POST errors. + Justification: + Regression when using the v2 protocol. + Votes: + +1: philip, rhuijben, cmpilato + * r1237720, r1239596 Log errors instead of ignoring them. Justification:
svn commit: r1239692 - /subversion/branches/1.7.x/STATUS
Author: cmpilato Date: Thu Feb 2 16:08:39 2012 New Revision: 1239692 URL: http://svn.apache.org/viewvc?rev=1239692view=rev Log: More voting. Voting is fun. 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=1239692r1=1239691r2=1239692view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 16:08:39 2012 @@ -53,15 +53,6 @@ Candidate changes: +1: gstein +1: rhuijben (r1236099 only) - * r1236173 - Do canonicalization rather than requring canonical data in some - mod_dav_svn requests. - Justification: - Backward compatibility with 1.6 clients when using URLs such - as http://host:80/rep%6f that 1.7 considers non-canonical. - Votes: - +1: philip, stsp - * r1146762, r1201419, r1227237, r1227250, r1227352, r1227372, r1227384, r1227385, r1239382, r1239631, r1239655 Fix issue #4059, can't commit when copy-op-root and copied-along @@ -166,3 +157,12 @@ Approved changes: r1239596 avoids suprious log messages for directory checksums with serf. Votes: +1: philip, danielsh, rhuijben + + * r1236173 + Do canonicalization rather than requring canonical data in some + mod_dav_svn requests. + Justification: + Backward compatibility with 1.6 clients when using URLs such + as http://host:80/rep%6f that 1.7 considers non-canonical. + Votes: + +1: philip, stsp, cmpilato
svn commit: r1239695 - in /subversion/branches/1.7.x: ./ STATUS build.conf contrib/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/
Author: danielsh Date: Thu Feb 2 16:13:20 2012 New Revision: 1239695 URL: http://svn.apache.org/viewvc?rev=1239695view=rev Log: Merge the r1207555 group from trunk: * r1207555, r1207808 mod_dontdothat: contrib/ - tools/ and relicense under ALv2. Justification: ASF infra is using this so we should maintain it. Stuff in contrib/ isn't officially maintained. Notes: r1207555: Perform the move (from r1207550) and relicense r1207808: Enable building mod_dontdothat from our standard make scripts. Votes: +1: rhuijben, stsp, cmpilato Added: subversion/branches/1.7.x/tools/server-side/mod_dontdothat/ (props changed) - copied from r1207555, subversion/trunk/tools/server-side/mod_dontdothat/ Removed: subversion/branches/1.7.x/contrib/server-side/mod_dontdothat/ Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/build.conf Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 2 16:13:20 2012 @@ -74,4 +74,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,1150344,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,115 6085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207656,1207663,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,12207 42,1220750,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-123,1232413,1235264,1235296,1235302,1235736,1236163,1236283,1236343
svn commit: r1239696 - in /subversion/branches/1.7.x: ./ STATUS subversion/mod_dav_svn/dav_svn.h subversion/mod_dav_svn/repos.c subversion/mod_dav_svn/util.c
Author: danielsh Date: Thu Feb 2 16:13:30 2012 New Revision: 1239696 URL: http://svn.apache.org/viewvc?rev=1239696view=rev Log: Merge the r1221178 group from trunk: * r1221178, r1221303 Fix issue 4086, mod_dav_svn's handling of POST errors. Justification: Regression when using the v2 protocol. Votes: +1: philip, rhuijben, cmpilato Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/mod_dav_svn/dav_svn.h subversion/branches/1.7.x/subversion/mod_dav_svn/repos.c subversion/branches/1.7.x/subversion/mod_dav_svn/util.c Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 2 16:13:30 2012 @@ -74,4 +74,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,1150344,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,115 6085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-12153 75,1215379,1220742,1220750,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-123,1232413,1235264,1235296,1235302,1235736,1236163,1236283,1236343
svn commit: r1239697 - in /subversion/branches/1.7.x: ./ STATUS subversion/mod_dav_svn/liveprops.c
Author: danielsh Date: Thu Feb 2 16:13:38 2012 New Revision: 1239697 URL: http://svn.apache.org/viewvc?rev=1239697view=rev Log: Merge the r1237720 group from trunk: * r1237720, r1239596 Log errors instead of ignoring them. Justification: Ignoring errors is bad. Notes: Due to preexisting ra_serf behaviour, may result in many server-side error log entries for every serf checkout. (This is separate from http://subversion.apache.org/docs/release-notes/1.7#serf, which has to do with the access log.) r1239596 avoids suprious log messages for directory checksums with serf. Votes: +1: philip, danielsh, rhuijben Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/mod_dav_svn/liveprops.c Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 2 16:13:38 2012 @@ -74,4 +74,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,1150344,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,115 6085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-12153 75,1215379,1220742,1220750,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-123,1232413,1235264,1235296,1235302,1235736,1236163,1236283,1236343
svn commit: r1239698 - in /subversion/branches/1.7.x: ./ STATUS subversion/mod_dav_svn/reports/update.c
Author: danielsh Date: Thu Feb 2 16:13:44 2012 New Revision: 1239698 URL: http://svn.apache.org/viewvc?rev=1239698view=rev Log: Merge r1236173 from trunk: * r1236173 Do canonicalization rather than requring canonical data in some mod_dav_svn requests. Justification: Backward compatibility with 1.6 clients when using URLs such as http://host:80/rep%6f that 1.7 considers non-canonical. Votes: +1: philip, stsp, cmpilato Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/mod_dav_svn/reports/update.c Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 2 16:13:44 2012 @@ -74,4 +74,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,1150344,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,115 6085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-12153 75,1215379,1220742,1220750,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-123,1232413,1235264,1235296,1235302,1235736,1236163,1236283,1236343,1237720,1239596
svn commit: r1239718 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh Date: Thu Feb 2 16:42:41 2012 New Revision: 1239718 URL: http://svn.apache.org/viewvc?rev=1239718view=rev Log: * tools/dist/backport.pl (merge): Add a backdoor way to force some in-theory-redundant output, so that two successive 'svn commit' prompts don't make pw-driver.pl re-prompt interactively. Modified: subversion/trunk/tools/dist/backport.pl Modified: subversion/trunk/tools/dist/backport.pl URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239718r1=1239717r2=1239718view=diff == --- subversion/trunk/tools/dist/backport.pl (original) +++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 16:42:41 2012 @@ -106,6 +106,10 @@ $SVNq up $SVNq merge $mergeargs $VIM -e -s -n -N -i NONE -u NONE -c '/$pattern/normal! dap' -c wq $STATUS if $WET_RUN; then + if [ -n \$PRINT_SOMETHING_BETWEEN_PROMPTS ]; then +# hack for pw-driver.pl to see some output between prompts +head -n1 $logmsg_filename + fi $SVNq commit -F $logmsg_filename else echo Committing:
[Subversion Wiki] Update of SvnMergeTheory by JulianFoad
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Subversion Wiki for
change notification.
The SvnMergeTheory page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diffrev1=12rev2=13
{{attachment:merge-reint-1.png|svn reintegrate merge}}
- The main significant difference is that Subversion selects a base node that
is on the ''target'' branch rather than on the ''source'' branch.
+ The main significant differences are:
- But what's the mergeinfo? [TODO...]
+ * For the 3-way merge, Subversion selects a base node that is on the
''target'' branch rather than on the ''source'' branch.
+ * For the mergeinfo, Subversion records all the changes along the source
branch (B), starting from 'O'. That does not accurately descibe either the set
of logical changes (because B3 was not a logical change) or the set of physical
changes (because B1 and B2 were not physically merged; A2:B3 was merged
instead, which is logically equivalent).
== 3-way or 4-way Merge ==
Subversion currently performs any requested merge as a sequence of 3-way
merges. For simple ''sync'' and ''reintegrate'' merges, that's exactly what's
needed. Usually there is just one 3-way merge, but if cherry-picks are being
skipped then Subversion breaks down the merge source range into sub-ranges and
performs one 3-way merge per sub-range.
[Subversion Wiki] Update of InheritedProperties by pburba
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Subversion Wiki for
change notification.
The InheritedProperties page has been changed by pburba:
http://wiki.apache.org/subversion/InheritedProperties?action=diffrev1=17rev2=18
Comment:
Add a note re Julian's question about a unifying principle of intra-WC
inheritance.
[1] This particular principle for how we treat the working version of a
WC is something I've had in mind for a long time and I think it can be very
useful in guiding how we design several aspects of WC behaviour, not just for
inheritable properties.BR
[2] When I say 'working node' I mean the 'topmost' version of the node in
the WC, no matter whether that is different from or the same as the base
version.
}}}
+ {{{#!wiki note
+ [PTB] JAF - I was envisioning a much simpler principle: Inheritance
within the WC is within the actual tree[1]. This is easy for a user to explain
and easy to understand. For example, no matter what the state of the WC a user
can always say, I see that 'my-WC/trunk' has the inheritable property
'InhPropName=PropVal'. That means that 'my-WC/trunk/README' inherits
'InhPropName=PropVal'. That makes sense! If I understand correctly what you
suggest, a user could face the case where a child path inherits a property
value that differs from its actual WC parent's value (if it inherits anything
at all). That strikes me as a recipe for user confusion.
+
+ [1] By actual tree I mean the topmost (i.e. MAX(op_depth)) version of
the node in the WC, pretty much the same thing your 2nd footnote means(?). I
thought we differentiated actual vs. working such that the former included
property and text changes?
+ }}}
1. Note an important implication of #2 and #3: Unlike svn:mergeinfo, a child
path with the svn:inheritable:X property explicitly set on it can also inherit
the svn:inheritable:X property from a parent. Our default approach will be for
child values to simply override parent values (exactly how svn:mergeinfo works
today). However, the APIs will support getting both explicit and/or inherited
property values. So it's possbile that child values might append to parent
values or more complex merging of properties may be performed based on the
specific property.
1. Unlike svn:mergeinfo, the property value a child inherits from a parent
will not be modified based on the path-difference between the parent and child.
The property value on the parent is the value the child will inherit. There
are no plans to provide an API which reveals the specific parent path a child
inherits from.
1. While setting inheritable properties on a file has no meaning from the
standpoint of inheritance, the property still applies to the file itself. Thus
there will be no prohibitions on setting inheritable properties on files.
@@ -192, +197 @@
{{{#!wiki note
[PTB] Instead of using a hash mapping parent paths to a hash of
properties, it probably makes more sense to use an array of structures which
contain the path/URL and the property hash as members. The array would be
sorted by the depth of the path/URL and would allow the caller to easily
determine the nearest parent of PATH if that is all that it needs (think of a
property with a svn:mergeinfo-like straight override model of inheritance where
all that ever matters is the nearest parent).
}}}
-
Rev svn_client_proplist3 to svn_client_proplist4, adding the argument
svn_boolean_t '''get_target_inherited_props''':
{{{#!cplusplus
svn commit: r1239745 - in /subversion: 1.7.x-issue4059/ branches/1.7.x-issue4059/
Author: stsp Date: Thu Feb 2 18:21:09 2012 New Revision: 1239745 URL: http://svn.apache.org/viewvc?rev=1239745view=rev Log: Move the 1.7.x-issue4059 folder into branches/ Added: subversion/branches/1.7.x-issue4059/ (props changed) - copied from r1239744, subversion/1.7.x-issue4059/ Removed: subversion/1.7.x-issue4059/ Propchange: subversion/branches/1.7.x-issue4059/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 2 18:21:09 2012 @@ -0,0 +1,2 @@ +[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+ +(\d+) Propchange: subversion/branches/1.7.x-issue4059/ -- bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID% Propchange: subversion/branches/1.7.x-issue4059/ -- --- svn:ignore (added) +++ svn:ignore Thu Feb 2 18:21:09 2012 @@ -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-issue4059/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Feb 2 18:21:09 2012 @@ -0,0 +1,77 @@ +/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-issue4032:1186668-1186784 +/subversion/branches/1.7.x-issue4035:1186202-1186315 +/subversion/branches/1.7.x-issue4035-r1185738:1186316-1186778 +/subversion/branches/1.7.x-issue4093:1229839-1230236 +/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/1.7.x-r1180154:1186224-1186351 +/subversion/branches/1.7.x-r1201824:1202121-1207333 +/subversion/branches/1.7.x-r1213331:1213684-1213756 +/subversion/branches/1.7.x-r1232221:1232358-1238008 +/subversion/branches/1.7.x-r1236343:1236628-1239394 +/subversion/branches/1.7.x-svn-patch-eol-fixes:1207511-1235924 +/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
svn commit: r1239746 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Thu Feb 2 18:22:22 2012 New Revision: 1239746 URL: http://svn.apache.org/viewvc?rev=1239746view=rev Log: * STATUS: Update 1.7.x-issue4059 branch URL. 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=1239746r1=1239745r2=1239746view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 18:22:22 2012 @@ -60,7 +60,7 @@ Candidate changes: Justification: Some copies can't be committed. Users complained. Branch: - ^/subversion/1.7.x-issue4059 + ^/subversion/branches/1.7.x-issue4059 Notes: r1146762 avoids a semantic conflict r1201419 adds a regression test
svn commit: r1239747 - /subversion/trunk/subversion/libsvn_client/commit_util.c
Author: stsp
Date: Thu Feb 2 18:27:44 2012
New Revision: 1239747
URL: http://svn.apache.org/viewvc?rev=1239747view=rev
Log:
* subversion/libsvn_client/commit_util.c
(harvest_committables): Remove a comment which became obsolete in r1239382.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1239747r1=1239746r2=1239747view=diff
==
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Thu Feb 2 18:27:44
2012
@@ -848,9 +848,6 @@ harvest_committables(svn_wc_context_t *w
if (parent_is_copy)
parent_abspath = copy_root_abspath;
- /* Copy the parent and target into pool; iterpool
- lasts only for this loop iteration, and we check
- danglers after the loop is over. */
if (!apr_hash_get(danglers, parent_abspath, APR_HASH_KEY_STRING))
{
apr_hash_set(danglers,
svn commit: r1239748 - in /subversion/branches/1.7.x-issue4059: ./ subversion/libsvn_client/commit_util.c
Author: stsp Date: Thu Feb 2 18:29:01 2012 New Revision: 1239748 URL: http://svn.apache.org/viewvc?rev=1239748view=rev Log: On the 1.7.x-issue4059 branch, merge r1239747 from trunk (obvious fix). Modified: subversion/branches/1.7.x-issue4059/ (props changed) subversion/branches/1.7.x-issue4059/subversion/libsvn_client/commit_util.c Propchange: subversion/branches/1.7.x-issue4059/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 2 18:29:01 2012 @@ -74,4 +74,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,1146762,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,1150344,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,115 5404,1156085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201419,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207656,1207663,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-12153 75,1215379,1220742,1220750,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-123,1232413,1235264,1235296,1235302,1235736,1236163,1236283,1236343,1239382,1239631,1239655
svn commit: r1239749 - /subversion/branches/1.7.x-issue4059/subversion/libsvn_client/commit_util.c
Author: stsp Date: Thu Feb 2 18:39:40 2012 New Revision: 1239749 URL: http://svn.apache.org/viewvc?rev=1239749view=rev Log: On the 1.7.x-issue4059 branch: * subversion/libsvn_client/commit_util.c (harvest_commitables): The code on trunk can rely on the is_explicit_target parameter to prevent unnecessarily checking danglers which aren't in the commit target list. On this branch, we can simulate the same by setting the danglers parameter to NULL during recursion. Prevents a performance regression (wc.db queries issued for explicit targets vs. every committable). Suggested by: rhuijben Modified: subversion/branches/1.7.x-issue4059/subversion/libsvn_client/commit_util.c Modified: subversion/branches/1.7.x-issue4059/subversion/libsvn_client/commit_util.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4059/subversion/libsvn_client/commit_util.c?rev=1239749r1=1239748r2=1239749view=diff == --- subversion/branches/1.7.x-issue4059/subversion/libsvn_client/commit_util.c (original) +++ subversion/branches/1.7.x-issue4059/subversion/libsvn_client/commit_util.c Thu Feb 2 18:39:40 2012 @@ -885,7 +885,7 @@ harvest_committables(svn_wc_context_t *w changelists, (depth svn_depth_files), (depth svn_depth_immediates), - danglers, + NULL, /* danglers */ check_url_func, check_url_baton, cancel_func, cancel_baton, notify_func, notify_baton,
svn commit: r1239750 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Thu Feb 2 18:41:12 2012 New Revision: 1239750 URL: http://svn.apache.org/viewvc?rev=1239750view=rev Log: * STATUS: Add r1239749. 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=1239750r1=1239749r2=1239750view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Feb 2 18:41:12 2012 @@ -54,7 +54,7 @@ Candidate changes: +1: rhuijben (r1236099 only) * r1146762, r1201419, r1227237, r1227250, r1227352, r1227372, r1227384, - r1227385, r1239382, r1239631, r1239655 + r1227385, r1239382, r1239631, r1239655, r1239749 Fix issue #4059, can't commit when copy-op-root and copied-along grandchild are explicit targets. Justification: @@ -72,6 +72,7 @@ Candidate changes: r1227385 is the actual fix r1239382 fixes the problem for nested copies, too r1239631 and r1239655 are follow-up comment fixes + r1239749 fixes a performance regression on the backport branch Votes: +1: stsp, rhuijben
[Subversion Wiki] Update of InheritedProperties by pburba
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Subversion Wiki for
change notification.
The InheritedProperties page has been changed by pburba:
http://wiki.apache.org/subversion/InheritedProperties?action=diffrev1=18rev2=19
Comment:
Create a 'Drawbacks' section to track the design's trade-offs. Move Daniel's
note into that section.
{{{#!wiki note
[JAF] Need to define the set of valid names and values. If they're in the
'svn:' namespace, then I imagine it needs to be (a subset of) the set of valid
'svn:' props -- mainly this means the values are UTF-8.
- }}}
- {{{#!wiki note
- [danielsh] Using the 'svn:inheritable:' namespace precludes a property from
being both inheritable and ${some_future_semantics}, since a property name
cannot be simultaneously in the 'svn:inheritable:' namespace and in the
'svn:{some_future_semantics}:' namespace.
}}}
== Inheritance Rules ==
Inheritance will be more flexible than the current svn:mergeinfo inheritance
model. For a given inheritable property 'svn:inheritable:X':
@@ -528, +525 @@
svn_boolean_t
svn_prop_is_inheritable_prop(const char *prop_name);
}}}
+ == Drawbacks ==
+ The suggested design above has some known drawbacks and trade-offs:
+ 1. [danielsh] Using the 'svn:inheritable:' namespace precludes a property
from being both inheritable and ${some_future_semantics}, since a property name
cannot be simultaneously in the 'svn:inheritable:' namespace and in the
'svn:{some_future_semantics}:' namespace.
+
[Subversion Wiki] Update of InheritedProperties by pburba
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Subversion Wiki for
change notification.
The InheritedProperties page has been changed by pburba:
http://wiki.apache.org/subversion/InheritedProperties?action=diffrev1=19rev2=20
Comment:
Address a note: Document valid property names and values for inheritable
properties.
1. Custom user properties will use the svn:inheritable: prefix.
1. Existing Subversion reserved properties will 'not' become
inheritable, they will function as they always have. New reserved Subversion
properties may be introduced that are inheritable by definition, but such
properties are not required to use any special namespace, beyond the normal
svn: prefix.
+ 1. Valid property names for both custom user and Subversion reserved
inheritable properties are as per any other other versioned property (i.e. text
only).
+ 1. Valid property values for both custom user and Subversion reserved
inheritable properties are as per any other Subversion reserved property (i.e.
text only and stored internally as UTF-8). This means that binary property
values are not supported even in the case of custom user properties.
- {{{#!wiki note
- [JAF] Need to define the set of valid names and values. If they're in the
'svn:' namespace, then I imagine it needs to be (a subset of) the set of valid
'svn:' props -- mainly this means the values are UTF-8.
- }}}
== Inheritance Rules ==
Inheritance will be more flexible than the current svn:mergeinfo inheritance
model. For a given inheritable property 'svn:inheritable:X':
svn commit: r1239863 - /subversion/trunk/subversion/libsvn_delta/compat.c
Author: danielsh
Date: Thu Feb 2 21:30:52 2012
New Revision: 1239863
URL: http://svn.apache.org/viewvc?rev=1239863view=rev
Log:
* subversion/libsvn_delta/compat.c: Typo fix
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=1239863r1=1239862r2=1239863view=diff
==
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Thu Feb 2 21:30:52 2012
@@ -118,7 +118,7 @@ typedef svn_error_t *(*unlock_func_t)(
const char *path,
apr_pool_t *scratch_pool);
-/* svn_editor__See insert_shims() for more information. */
+/* See svn_editor__insert_shims() for more information. */
struct extra_baton
{
start_edit_func_t start_edit;
svn commit: r1239869 - /subversion/trunk/subversion/libsvn_subr/deprecated.c
Author: stsp
Date: Thu Feb 2 21:38:14 2012
New Revision: 1239869
URL: http://svn.apache.org/viewvc?rev=1239869view=rev
Log:
Follow-up to r1239841: Fix many crashes and test failures (ooops!)
* subversion/libsvn_subr/deprecated.c
(svn_io_start_cmd2): Properly pass arguments on to svn_io_start_cmd3().
Modified:
subversion/trunk/subversion/libsvn_subr/deprecated.c
Modified: subversion/trunk/subversion/libsvn_subr/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/deprecated.c?rev=1239869r1=1239868r2=1239869view=diff
==
--- subversion/trunk/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_subr/deprecated.c Thu Feb 2 21:38:14
2012
@@ -780,8 +780,9 @@ svn_io_start_cmd2(apr_proc_t *cmd_proc,
apr_file_t *errfile,
apr_pool_t *pool)
{
- return svn_io_start_cmd3(cmd_proc, path, cmd, args, NULL, inherit, FALSE,
- infile, FALSE, outfile, FALSE, errfile, pool);
+ return svn_io_start_cmd3(cmd_proc, path, cmd, args, NULL, inherit,
+ infile_pipe, infile, outfile_pipe, outfile,
+ errfile_pipe, errfile, pool);
}
svn_error_t *
[Subversion Wiki] Update of InheritedProperties by pburba
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Subversion Wiki for
change notification.
The InheritedProperties page has been changed by pburba:
http://wiki.apache.org/subversion/InheritedProperties?action=diffrev1=20rev2=21
Comment:
Move Julian's note about the limitations of absent/present properties to the
'Drawbacks' section.
1. While setting inheritable properties on a file has no meaning from the
standpoint of inheritance, the property still applies to the file itself. Thus
there will be no prohibitions on setting inheritable properties on files.
1. If a child path which inherits a property is copied, the inherited
properties are not copied with it. The new destination path inherits
properties from its new parents. This means that depending on the copy
destination the new path may or may not inherit the same property, and even if
it does, it may inherit a different value. This puts the onus on users to set
their inheritable properties as close to the root of the repository tree as
makes sense for the property in question. Have a property you want to apply
to the whole repository? Set it on the root. Want it to apply only to a
single project? Set it on the root of the project. Note that if a path has an
inheritable property 'explicitly' set on it, the property is copied
just like any other versioned property.
- {{{#!wiki note
- [JAF] I note that there is no ability to specify that an inheritable
property should be 'deleted' rather than overridden with a new value.
Thus we can't use absent/present semantics similar to 'svn:needs-lock'. If we
set an inheritable equivalent of 'svn:needs-lock = *' on a parent dir, there is
no way to designate a particular child node as explicitly removing that
inherited property. That's probably fine -- we can just avoid using the
absent/present semantics for that kind of purpose -- but it deserves to be
mentioned.
- }}}
'### TBD: Externals: Do they work like switched subtrees?'
== Inherited Properties Cache ==
@@ -528, +525 @@
The suggested design above has some known drawbacks and trade-offs:
1. [danielsh] Using the 'svn:inheritable:' namespace precludes a property
from being both inheritable and ${some_future_semantics}, since a property name
cannot be simultaneously in the 'svn:inheritable:' namespace and in the
'svn:{some_future_semantics}:' namespace.
+ 1. [JAF] I note that there is no ability to specify that an inheritable
property should be 'deleted' rather than overridden with a new value.
Thus we can't use absent/present semantics similar to 'svn:needs-lock'. If we
set an inheritable equivalent of 'svn:needs-lock = *' on a parent dir, there is
no way to designate a particular child node as explicitly removing that
inherited property. That's probably fine -- we can just avoid using the
absent/present semantics for that kind of purpose -- but it deserves to be
mentioned.
svn commit: r1239926 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h
Author: stsp
Date: Thu Feb 2 23:29:11 2012
New Revision: 1239926
URL: http://svn.apache.org/viewvc?rev=1239926view=rev
Log:
Add a public libsvn_repos API to set the environment of hook scripts.
The default environment of hooks is still empty.
Users of libsvn_repos may optionally call svn_repos_hooks_setenv()
to configure an environment that all hooks will run in.
Nothing does so yet so this commit makes no functional change.
* subversion/libsvn_repos/repos.h
(svn_repos_t): Add new hooks_env field.
* subversion/include/svn_repos.h
(svn_repos_hooks_setenv): Declare.
* subversion/libsvn_repos/repos.c
(svn_repos_hooks_setenv): New.
* subversion/libsvn_repos/hooks.c
(run_hook_cmd): New parameter hooks_env. Use svn_io_start_cmd3() to run
hooks. It supports passing an environment to the child process.
(svn_repos__hooks_start_commit, svn_repos__hooks_pre_commit,
svn_repos__hooks_post_commit, svn_repos__hooks_pre_revprop_change,
svn_repos__hooks_post_revprop_change, svn_repos__hooks_pre_lock,
svn_repos__hooks_post_lock, svn_repos__hooks_pre_unlock,
svn_repos__hooks_post_unlock): Pass the repository's hooks environment
to run_hook_cmd().
Modified:
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/libsvn_repos/hooks.c
subversion/trunk/subversion/libsvn_repos/repos.c
subversion/trunk/subversion/libsvn_repos/repos.h
Modified: subversion/trunk/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1239926r1=1239925r2=1239926view=diff
==
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Thu Feb 2 23:29:11 2012
@@ -764,6 +764,13 @@ const char *
svn_repos_post_unlock_hook(svn_repos_t *repos,
apr_pool_t *pool);
+/** Set the environment that @ repos's hooks will inherit.
+ * If this function is not called, hooks will run in an empty environment.
+ * @since New in 1.8. */
+void
+svn_repos_hooks_setenv(svn_repos_t *repos,
+ const char *const *hooks_env);
+
/** @} */
/* ---*/
Modified: subversion/trunk/subversion/libsvn_repos/hooks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/hooks.c?rev=1239926r1=1239925r2=1239926view=diff
==
--- subversion/trunk/subversion/libsvn_repos/hooks.c (original)
+++ subversion/trunk/subversion/libsvn_repos/hooks.c Thu Feb 2 23:29:11 2012
@@ -174,6 +174,7 @@ run_hook_cmd(svn_string_t **result,
const char *name,
const char *cmd,
const char **args,
+ const char *const *hooks_env,
apr_file_t *stdin_handle,
apr_pool_t *pool)
{
@@ -196,7 +197,7 @@ run_hook_cmd(svn_string_t **result,
(apr_err, _(Can't create null stdout for hook '%s'), cmd);
}
- err = svn_io_start_cmd2(cmd_proc, ., cmd, args, FALSE,
+ err = svn_io_start_cmd3(cmd_proc, ., cmd, args, hooks_env, FALSE,
FALSE, stdin_handle, result != NULL, null_handle,
TRUE, NULL, pool);
@@ -358,8 +359,8 @@ svn_repos__hooks_start_commit(svn_repos_
args[3] = capabilities_string;
args[4] = NULL;
- SVN_ERR(run_hook_cmd(NULL, SVN_REPOS__HOOK_START_COMMIT, hook, args,
NULL,
- pool));
+ SVN_ERR(run_hook_cmd(NULL, SVN_REPOS__HOOK_START_COMMIT, hook, args,
+ repos-hooks_env, NULL, pool));
}
return SVN_NO_ERROR;
@@ -438,7 +439,7 @@ svn_repos__hooks_pre_commit(svn_repos_t
APR_READ, APR_OS_DEFAULT, pool));
SVN_ERR(run_hook_cmd(NULL, SVN_REPOS__HOOK_PRE_COMMIT, hook, args,
- stdin_handle, pool));
+ repos-hooks_env, stdin_handle, pool));
}
return SVN_NO_ERROR;
@@ -466,8 +467,8 @@ svn_repos__hooks_post_commit(svn_repos_t
args[2] = apr_psprintf(pool, %ld, rev);
args[3] = NULL;
- SVN_ERR(run_hook_cmd(NULL, SVN_REPOS__HOOK_POST_COMMIT, hook, args, NULL,
- pool));
+ SVN_ERR(run_hook_cmd(NULL, SVN_REPOS__HOOK_POST_COMMIT, hook, args,
+ repos-hooks_env, NULL, pool));
}
return SVN_NO_ERROR;
@@ -514,8 +515,8 @@ svn_repos__hooks_pre_revprop_change(svn_
args[5] = action_string;
args[6] = NULL;
- SVN_ERR(run_hook_cmd(NULL, SVN_REPOS__HOOK_PRE_REVPROP_CHANGE, hook,
args,
- stdin_handle, pool));
+ SVN_ERR(run_hook_cmd(NULL, SVN_REPOS__HOOK_PRE_REVPROP_CHANGE, hook,
+ args, repos-hooks_env, stdin_handle, pool));
SVN_ERR(svn_io_file_close(stdin_handle, pool));
svn commit: r1239966 - in /subversion/trunk/subversion/mod_dav_svn: dav_svn.h mod_dav_svn.c repos.c
Author: stsp
Date: Fri Feb 3 01:02:08 2012
New Revision: 1239966
URL: http://svn.apache.org/viewvc?rev=1239966view=rev
Log:
Add a mod_dav_svn configuration option to set the environment of hook scripts.
The default environment of hooks is still empty.
The new option is called SVNHooksEnv, applies globally or within
Location directives, and takes any number of arguments.
Each argument specifies one environment variable in the form VAR=VAL.
If spaces appear in the variable name or value the entire option argument
needs to be quoted. For example:
SVNHooksEnv LC_CTYPE=en_US.UTF-8 VAR_WITH_A_SPACE=foo bar
* subversion/mod_dav_svn/dav_svn.h
(dav_svn__get_hooks_env): Declare.
* subversion/mod_dav_svn/mod_dav_svn.c
(dir_conf_t): Add hooks_env.
(create_dir_config): Initialise hooks_env.
(merge_dir_config): Merge hooks_env fields.
(SVNHooksEnv_cmd): New. Parses arguments given to SVNHooksEnv option
into a hash table.
(dav_svn__get_hooks_env): Returns the hooks environment hash table
parsed from the configuration.
(cmds): Add SVNHooksEnv option.
* subversion/mod_dav_svn/repos.c
(env_from_env_hash): New helper function. Copies an environment from
a hash table into an array of C strings.
(get_resource): If necessary, configure the repository's hooks
environment after opening the repository.
Modified:
subversion/trunk/subversion/mod_dav_svn/dav_svn.h
subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
subversion/trunk/subversion/mod_dav_svn/repos.c
Modified: subversion/trunk/subversion/mod_dav_svn/dav_svn.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/dav_svn.h?rev=1239966r1=1239965r2=1239966view=diff
==
--- subversion/trunk/subversion/mod_dav_svn/dav_svn.h (original)
+++ subversion/trunk/subversion/mod_dav_svn/dav_svn.h Fri Feb 3 01:02:08 2012
@@ -385,6 +385,9 @@ const char *dav_svn__get_root_dir(reques
/* Return the data compression level to be used over the wire. */
int dav_svn__get_compression_level(void);
+/* Return the hook script environment parsed from the configuration. */
+apr_hash_t *dav_svn__get_hooks_env(request_rec *r);
+
/** For HTTP protocol v2, these are the new URIs and URI stubs
returned to the client in our OPTIONS response. They all depend
on the 'special uri', which is configurable in httpd.conf. **/
Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1239966r1=1239965r2=1239966view=diff
==
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Fri Feb 3 01:02:08
2012
@@ -25,6 +25,7 @@
#include stdlib.h
#include apr_strings.h
+#include apr_hash.h
#include httpd.h
#include http_config.h
@@ -94,6 +95,7 @@ typedef struct dir_conf_t {
const char *activities_db; /* path to activities database(s) */
enum conf_flag txdelta_cache; /* whether to enable txdelta caching */
enum conf_flag fulltext_cache; /* whether to enable fulltext caching */
+ apr_hash_t *hooks_env; /* environment for hook scripts */
} dir_conf_t;
@@ -193,6 +195,7 @@ create_dir_config(apr_pool_t *p, char *d
conf-root_dir = svn_urlpath__canonicalize(dir, p);
conf-bulk_updates = CONF_FLAG_ON;
conf-v2_protocol = CONF_FLAG_ON;
+ conf-hooks_env = apr_hash_make(p);
return conf;
}
@@ -222,6 +225,9 @@ merge_dir_config(apr_pool_t *p, void *ba
newconf-txdelta_cache = INHERIT_VALUE(parent, child, txdelta_cache);
newconf-fulltext_cache = INHERIT_VALUE(parent, child, fulltext_cache);
newconf-root_dir = INHERIT_VALUE(parent, child, root_dir);
+ newconf-hooks_env = apr_hash_merge(p, child-hooks_env, parent-hooks_env,
+ NULL /* child overrides parent */,
+ NULL /* unused data baton */);
if (parent-fs_path)
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
@@ -528,6 +534,25 @@ SVNUseUTF8_cmd(cmd_parms *cmd, void *con
return NULL;
}
+static const char *
+SVNHooksEnv_cmd(cmd_parms *cmd, void *config, const char *arg1)
+{
+ apr_array_header_t *var;
+
+ var = svn_cstring_split(arg1, =, TRUE, cmd-pool);
+ if (var var-nelts == 2)
+{
+ dir_conf_t *conf = config;
+
+ apr_hash_set(conf-hooks_env,
+ APR_ARRAY_IDX(var, 0, const char *),
+ APR_HASH_KEY_STRING,
+ APR_ARRAY_IDX(var, 1, const char *));
+}
+
+ return NULL;
+}
+
/** Accessor functions for the module's configuration state **/
@@ -805,6 +830,15 @@ dav_svn__get_compression_level(void)
return svn__compression_level;
}
+apr_hash_t *
+dav_svn__get_hooks_env(request_rec *r)
+{
+ dir_conf_t *conf;
+
+ conf =
svn commit: r1239970 - /subversion/trunk/CHANGES
Author: stsp Date: Fri Feb 3 01:13:29 2012 New Revision: 1239970 URL: http://svn.apache.org/viewvc?rev=1239970view=rev Log: * CHANGES: Mention new SVNHooksEnv mod_dav_svn option. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1239970r1=1239969r2=1239970view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Fri Feb 3 01:13:29 2012 @@ -17,6 +17,7 @@ http://svn.apache.org/repos/asf/subversi * support GPG agent for password storage on UNIX-like platforms (r1150783) * new 'svnadmin lock' / 'svnadmin unlock' subcommands (issue #3942, #4092) * new SVNUseUTF8 configuration option for mod_dav_svn (issue #2487) +* new SVNHooksEnv configuration option for mod_dav_svn (r1239966) * new --ignore-properties option for 'svn diff' (r1239553. -617) * new --patch-compatible option for 'svn diff' (r1239561)
svn commit: r1240013 - /subversion/branches/1.7.x/STATUS
Author: jcorvel Date: Fri Feb 3 07:07:54 2012 New Revision: 1240013 URL: http://svn.apache.org/viewvc?rev=1240013view=rev Log: * STATUS: add rhuijben's vote to r1227900 (vote by email to dev@) 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=1240013r1=1240012r2=1240013view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Fri Feb 3 07:07:54 2012 @@ -91,7 +91,7 @@ Candidate changes: to tools and adding it to build.conf was just backported to 1.7.x in r1239695. Votes: - +1: jcorvel + +1: jcorvel, rhuijben Veto-blocked changes: =
