Checkout Tools
  • last updated 2 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1481041 is being indexed.

Sync the 'master-passphrase' branch up with recent (and, uh, not-so-recent)

trunk changes. (Merged /subversion/trunk:r1451629-1481020)

  1. … 548 more files in changeset.
Create 1.7.x-r1481010 backport branch.
* STATUS (for 1.7.x): Vote for r1475724.

* STATUS: Propose r1481010.
Fix issue 4365, multi-threaded svnserve pool memory use after clear.

* subversion/svnserve/svnserve.c

(struct shared_pool_t): New.

(attach_shared_pool, release_shared_pool): New.

(struct serve_thread_t): Replace pool with shared_pool.

(serve_thread): Use and release shared pool.

(main): Setup and release shared pool.

Suggested by: ivan

* tools/buildbot/slaves/bb-openbsd/ Revert changes from r1480393,

the problem has been fixed in the buildbot master config (see infra

repository r861433).

* subversion/tests/libsvn_fs/fs-test.c

(filename_trailing_newline): Update synopsis of issue #4340 in comment.

* subversion/tests/libsvn_repos/repos-test.c

(filename_with_control_chars): Update synopsis of issue #4340 in comment.

* STATUS (for 1.7.x): Expand my vote for #4306 fix.

* STATUS: Split issue #4340 backport nomination into two separate ones, one

for blocking \n in FSFS, and one for blocking control chars in libsvn_repos.

* STATUS: Fix more erroneous revnums listed in issue #4340 group.

* STATUS: Fix revision numbers listed in issue #4340 group.

On the 1.7.x-issue4340 branch, undo r1465998, which merged changes which now

live on the 1.7.x-issue4340-repos branch.

On the 1.7.x-issue4340-repos branch, merge r1461760 from trunk, resolving

some semantic conflicts.

* subversion/tests/libsvn_repos/repos-test.c

(filename_with_control_chars): Account for the lack of the

SVN_TEST_ASSERT_ERROR macro on the 1.7.x branch.

Also, update a comment to use the current synopsis of issue #4340.

Create a 1.7.x backport branch for the repos-specific fixes for issue #4340.

* STATUS: Fix parse error.
Merge a no-longer-useful error construction helper function into its only

remaining caller.

* subversion/libsvn_repos/delta.c

(not_a_dir_error): Delete.

(svn_repos_dir_delta2): Write the equivalent error return in-line here.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h

(ruby/io.h): Include the appropriate Ruby header if using Ruby 1.9 and

thus avoid the 'use "ruby/io.h" instead of "rubyio.h"' warning.

Another Ruby 1.9 fix for Windows.

* subversion/bindings/swig/ruby/test/windows_util.rb

(SvnTestUtil.Windows.SetupEnvironment.gen_make_opts): String objects in 1.9

no longer have the to_a method, so use a workaround that works for both

1.9 and 1.8.

* STATUS: Add r1478998 and r1480723 to issue #4355 group.

On the 1.8.x branch, merge r1471443 and r1471490 from trunk.

* r1471443, r1471490

Fix a bug in the Summary of Conflicts when using interactive conflict

resolution. Marking a text conflict as resolved but leaving a prop

conflict unresolved on the same file, or vice versa, would decrement

both the text and prop conflict summary stats.


Regression since 1.7.


r1471443 is just a removal of unused code, and is included here in

order to avoid conflicts. r1471490 is the main change.


+1: julianfoad, brane, stsp

    • ?
More cleanup to issue #4355 'svn_client_log5 broken with multiple

revisions which span a rename' fix in r1478220.

Suggested by: cmpilato


* subversion/libsvn_client/log.c

(svn_client_log5): Fix typo in doc string. We know what size the output

array will be, so just initialize it to that size. Remove an unnecessary


(convert_opt_rev_array_to_rev_range_array): Replace memcmp comparison of

two structures with proper member-wise comparison.

(find_youngest_and_oldest_revs): Remove unecessary return statement.

* CHANGES: Tweak 1.8.0 entries related to svnauthz.


Record 1.8.0 changes from the -r1214773:1182978 range. Also, fix the

statement which notes the introduction of FSv2 to point out that this

is a private API only. (We may wish to simply strike the item altogether.)

* tools/buildbot/slaves/bb-openbsd/ Fix for 1.8.x, and also for

1.9.x and 1.10.x so we won't have to fix it again for a couple of years.

Clarify doc strings related to conflicts.

* subversion/include/svn_wc.h

(svn_wc_create_conflict_result): Be explicit about the 'save_merged'

field. Remove wording that may be read as documenting what a future

implementation will do with any new fields, since we don't need to say

this until it happens and the way it was described here is not

necessarily exactly what we would want to do. (All we really promise is

that it will behave in a backward compatible manner, and that's an

implicit promise across all of our APIs.)

* subversion/libsvn_wc/conflicts.h

(svn_wc__conflict_create_markers): Clarify.

* STATUS: Propose my prop conflict changes from today for 1.8.0.

Factor out some common code in conflict handling.

* subversion/libsvn_wc/conflicts.c

(merge_showing_conflicts): New function, factored out ...


resolve_text_conflict_on_node): ... of these two functions.

Also note that these two functions are redundantly similar.

If a merged property value exists, make the 'dc' conflict prompt option use

the merged value as 'mine' for display. Else, users might get confused if

they edit a property, run 'dc', and see the value from before the edit.

* subversion/svn/conflict-callbacks.c

(show_prop_conflict, merge_prop_conflict): Add merged_abspath parameter.

Use it as 'my' version if non-NULL.

(edit_prop_conflict): For now, pass NULL for the merged file to

merge_prop_conflict(), so that repeated edits always start with

the same original values. This behaviour can be reconsidered later.

(handle_prop_conflict): Pass the path to the merged file, which might be

NULL, to show_prop_conflict().

* subversion/svn/conflict-callbacks.c

(handle_prop_conflict): Don't allow 'r' to be used if no merged property

value exists yet. Fix indentation while here.