subversion

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

Changeset 1764572 is being indexed.

[Note from the future: reverted in r1764633, to fix backport mixup]

Merge the 1.9.x-r1721488 branch:

* r1721488, r1721648

Enable building bindings with SWIG >= 3.0.6

Justification:

Enable building bindings with SWIG 3.x. SWIG 2.x is end-of-life (no

releases since 2014) and is starting to be removed from Linux

distributions.

Branch:

^/subversion/branches/1.9.x-r1721488

Votes:

+1: jamessan, stefan2

[Note from the future: reverted in r1764633, to fix backport mixup]

Merge r1722164 from trunk:

* r1722164

Filter out -Wdate-time from SWIG_CPPFLAGS

Justification:

Fixes bindings build failure when -Wdate-time is present in $CPPFLAGS

Votes:

+1: jamessan, stefan2

+1: rhuijben (Would prefer some redesign for trunk though)

[Note from the future: reverted in r1764633, to fix backport mixup]

Merge r1764034 from trunk:

* r1764034

Use 'Apache Software Foundation' instead of 'http://subversion.apache.org'

as CompanyName/Publisher for Windows executables.

Justification:

Minor tweak that makes Subversion look a little bit better in Windows

Task Manager.

Votes:

+1: ivan, brane, stefan2

[Note from the future: reverted in r1764633, to fix backport mixup]

Merge r1763934 from trunk:

* r1763934

Add the OSX 10.12 commercial name for 'svn --version --verbose'.

Justification:

Very minor change makes SVN look slightly more polished.

Votes:

+1: brane, ivan, stefan2

Merge r1764034 from trunk:

* r1764034

Use 'Apache Software Foundation' instead of 'http://subversion.apache.org'

as CompanyName/Publisher for Windows executables.

Justification:

Minor tweak that makes Subversion look a little bit better in Windows

Task Manager.

Votes:

+1: ivan, brane, stefan2

Merge r1763934 from trunk:

* r1763934

Add the OSX 10.12 commercial name for 'svn --version --verbose'.

Justification:

Very minor change makes SVN look slightly more polished.

Votes:

+1: brane, ivan, stefan2

Remove the '1.8.x-r1702299' branch, merged in r1764565.
Merge the 1.8.x-r1702299 branch:

* r1702299, r1702300, r1702397, r1702407, r1702565

Handle merging to local add as error instead of segfault.

Justification:

Segfault. User reported.

Notes:

r1702299 adds a testcase.

r1702397 fixes the problem with automatic merge and updates the test.

r1702565 fixes a quite similar segfault with --reintegrate merge.

The other revisions are minor cleanup.

Branch:

^/subversion/branches/1.8.x-r1702299

Votes:

+1: rhuijben, julianfoad, stefan2

* STATUS: Veto r1759116 group.

* STATUS:

Fix revision number in r1759116 group.

Found by: jcorvel

On branch 'master-passphrase':

* BRANCH-README

bus_factor++

On the authzperf branch:

Some authz test cleanup and re-enabling some tests to match /trunk.

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

(authz): Re-enable the "phase 4" tests and move the performance

measurements to ...

(test_authz_wildcard_performance): ... this new test.

(groups_authz): Test that we reject illegal files with RAM and disk

alike. Perform the authz tests with a legal setup.

This roughly covers what we test on /trunk.

(test_funcs): Register the new test and skip it by default.

On the authzperf branch:

* subversion/libsvn_repos/authz.c

(add_next_node): Refine commentary. No functional change.

Bring comment about caching priorities in line with the code,

after r1721285 changed the dir caching priority.

* subversion/libsvn_fs_fs/caching.c

(svn_fs_fs__initialize_caches): Sync comment with reality.

* STATUS: Vote for and approve r1721285.

Remove variables which are written but not used in any way.

* subversion/libsvn_client/conflicts.c:

(conflict_tree_get_incoming_description_generic,

conflict_tree_get_description_incoming_edit,

resolve_incoming_move_dir_merge,

configure_option_incoming_delete_accept,

configure_option_incoming_move_file_merge,

configure_option_incoming_dir_merge): Remove unused variables.

Patch by: Patrick Steinhardt <patrick.steinhardt@elegosoft.com>

[Note from the future: reverted in r1795871.]

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

(test_delta): Expect and resolve text conflict to account for new behaviour

with flagging text conflicts since r1731699.

Rework the log scanning code in the tree conflict resolver, so that it

would use a single RA session to perform the additional requests

(by reparenting it, instead of opening a new session every time).

* subversion/libsvn_client/conflicts.c

(find_deleted_rev_baton): Add new 'extra_ra_session' field.

(find_revision_for_suspected_deletion): Initialize the extra session by

duplicating the existing session.

(check_move_ancestry): Accept an RA session, instead of a client context.

Reparent the session if needed, and use it to perform requests.

(find_moves_in_revision): Accept an RA session, instead of a client context.

(find_deleted_rev): Pass the extra RA session.

[Note from the future: reverted in r1795871.]

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

(test_diff_merge): Update expected output to account for new behaviour

with flagging text conflicts since r1731699.

Revert r1764453, as it has unexpected side effects.
* subversion/tests/libsvn_client/conflicts-test.c

(test_merge_incoming_chained_move_local_edit): Update the comment in

this test. The test used to fail, but passes now.

* subversion/libsvn_wc/wc_db_update_move.c

(tc_editor_merge_local_file_change): Don't pass unnecessary

optional argument.

Followup for r1764451: remove two unused variables from test.

* subversion/tests/cmdline/depth_tests.py

(fold_tree_with_deleted_moved_items): Remove unused variables.

Add an XFail test for issue #4636 (Making working copy sparse loses local

deletes / moves).

* subversion/tests/cmdline/depth_tests.py

(fold_tree_with_deleted_moved_items): New XFail test for issue #4636.

Add a note to the working copy crop function about issue #4636.

* subversion/libsvn_wc/crop.c

(crop_children): Add comment.

Don't flag an unnecessary tree conflict while resolving 'add vs add'.

* subversion/libsvn_client/conflicts.c

(merge_added_files): New helper function.

(diff_file_added): If a file already exists then just merge with the

incoming file and return.

* subversion/tests/libsvn_client/conflicts-test.c

(test_merge_incoming_added_dir_merge, test_merge_incoming_added_dir_merge2,

test_merge_incoming_added_dir_merge3): Adjust test expectations accordingly.

Inline the function that's only used at a single calling site.

* subversion/libsvn_client/conflicts.c

(merge_incoming_added_file_replace): Inline this function ...

(resolve_merge_incoming_added_file_replace_and_merge): ...here. Since

the calling site was always calling it with 'merge_files' set to true,

drop the handling of this argument.

* STATUS:

Move the r1721488 group to "Approved"; bindings need just 2 votes.

Following up on r1764435, remove two unused functions.

The merge_incoming_added_file_replace() function is now always called with

'merge_files' set to true, and this code can be simplified, but I'll do it

separately.

* subversion/libsvn_client/conflicts.c

(resolve_merge_incoming_added_file_replace,

resolve_update_incoming_added_file_replace): Remove these unused functions.

Follow-up to r1764423: tweak initial size of APR array for the text conflict

options to match maximum number of entries to be added.

* subversion/libsvn_client/conflicts.c

(svn_client_conflict_text_get_resolution_options): Pass 7 instead of 6 as

initial APR array size.

Found by: luke1410