Author: stefan2
Date: Wed Oct 12 19:53:50 2016
New Revision: 1764532
URL: http://svn.apache.org/viewvc?rev=1764532=rev
Log:
* STATUS:
Fix revision number in r1759116 group.
Found by: jcorvel
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
Author: cmpilato
Date: Wed Oct 12 19:52:11 2016
New Revision: 1764531
URL: http://svn.apache.org/viewvc?rev=1764531=rev
Log:
On branch 'master-passphrase':
* BRANCH-README
bus_factor++
Modified:
subversion/branches/master-passphrase/BRANCH-README
Modified:
Author: ivan
Date: Wed Oct 12 09:47:10 2016
New Revision: 1764423
URL: http://svn.apache.org/viewvc?rev=1764423=rev
Log:
Refactor svn_client_conflict_text_get_resolution_options() and
svn_client_conflict_prop_get_resolution_options().
* subversion/libsvn_client/conflicts.c
Author: ivan
Date: Wed Oct 12 11:15:53 2016
New Revision: 1764439
URL: http://svn.apache.org/viewvc?rev=1764439=rev
Log:
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
Author: stefan2
Date: Wed Oct 12 09:06:34 2016
New Revision: 1764407
URL: http://svn.apache.org/viewvc?rev=1764407=rev
Log:
* STATUS:
Vote for and approve r1763934 and r1764034.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
Author: stefan2
Date: Wed Oct 12 10:06:03 2016
New Revision: 1764426
URL: http://svn.apache.org/viewvc?rev=1764426=rev
Log:
* STATUS:
Vote for r1701488 (check-mime-type.pl)
Vote for r1706783 (svn_client_patch fix)
Vote for r1711346 (temp file handling in svnlook)
Modified:
Author: stsp
Date: Wed Oct 12 10:33:08 2016
New Revision: 1764434
URL: http://svn.apache.org/viewvc?rev=1764434=rev
Log:
Don't flag an unnecessary tree conflict while resolving 'add vs add'.
* subversion/libsvn_client/conflicts.c
(diff_dir_added): If a subdirectory already exists then just
Author: kotkov
Date: Wed Oct 12 11:23:32 2016
New Revision: 1764441
URL: http://svn.apache.org/viewvc?rev=1764441=rev
Log:
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
Author: stefan2
Date: Wed Oct 12 10:30:07 2016
New Revision: 1764433
URL: http://svn.apache.org/viewvc?rev=1764433=rev
Log:
* STATUS:
Vote for r1717875 group (consistent props over RA)
Vote for r1728387 (special chars in gpg-agent passwords)
Vote for r1745515 group (serf download URL)
Author: stsp
Date: Wed Oct 12 10:09:00 2016
New Revision: 1764427
URL: http://svn.apache.org/viewvc?rev=1764427=rev
Log:
Remove an unnecessary and unused output parameter from a helper function.
* subversion/libsvn_client/conflicts.c
(merge_newly_added_dir): Remove the 'conflict_report' output
Author: kotkov
Date: Wed Oct 12 10:34:52 2016
New Revision: 1764435
URL: http://svn.apache.org/viewvc?rev=1764435=rev
Log:
In the tree conflict resolver, remove the options that simultaneosly resolve
the tree *and* the potential text conflict in the file "add vs add" case.
This turns the
Author: rhuijben
Date: Wed Oct 12 10:52:42 2016
New Revision: 1764437
URL: http://svn.apache.org/viewvc?rev=1764437=rev
Log:
Resolve two warnings in libsvn_fs_x on non-posix systems.
* subversion/libsvn_fs_x/batch_fsync.c
(internal_open_file): Reduce scope of one variable and conditionally
Author: stefan2
Date: Wed Oct 12 09:43:16 2016
New Revision: 1764421
URL: http://svn.apache.org/viewvc?rev=1764421=rev
Log:
* STATUS:
Remove -0 vote from r1721285 after talking to stsp
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
Author: rhuijben
Date: Wed Oct 12 10:36:03 2016
New Revision: 1764436
URL: http://svn.apache.org/viewvc?rev=1764436=rev
Log:
Resolve two minor Windows specific corectness warnings found by a newer
compiler version.
* subversion/libsvn_subr/io.c
(svn_io__utf8_to_unicode_longpath): Remove
Author: stefan2
Date: Wed Oct 12 11:01:57 2016
New Revision: 1764438
URL: http://svn.apache.org/viewvc?rev=1764438=rev
Log:
On the authzperf branch:
Some test cleanup.
* subversion/tests/libsvn_repos/repos-test.c
(test_authz_pattern_tests): Add commentary and strengthen one test case.
Author: stefan2
Date: Wed Oct 12 09:40:17 2016
New Revision: 1764420
URL: http://svn.apache.org/viewvc?rev=1764420=rev
Log:
* STATUS:
Vote for and approve r1722164 (-Wdate-time bindings build issue).
Vote for r1721488 group (SWIG 3.0)
Vote for r1758128 group (bin confict resolution)
Author: stefan2
Date: Wed Oct 12 09:52:35 2016
New Revision: 1764424
URL: http://svn.apache.org/viewvc?rev=1764424=rev
Log:
* STATUS:
Vote for and approve r1702299 group (segfault on merge)
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
Author: jcorvel
Date: Wed Oct 12 15:35:24 2016
New Revision: 1764481
URL: http://svn.apache.org/viewvc?rev=1764481=rev
Log:
Bring comment about caching priorities in line with the code,
after r1721285 changed the dir caching priority.
* subversion/libsvn_fs_fs/caching.c
Author: rhuijben
Date: Wed Oct 12 12:43:36 2016
New Revision: 1764449
URL: http://svn.apache.org/viewvc?rev=1764449=rev
Log:
Add a note to the working copy crop function about issue #4636.
* subversion/libsvn_wc/crop.c
(crop_children): Add comment.
Modified:
Author: kotkov
Date: Wed Oct 12 13:02:01 2016
New Revision: 1764454
URL: http://svn.apache.org/viewvc?rev=1764454=rev
Log:
* 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.
Author: rhuijben
Date: Wed Oct 12 13:30:13 2016
New Revision: 1764463
URL: http://svn.apache.org/viewvc?rev=1764463=rev
Log:
Revert r1764453, as it has unexpected side effects.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified:
Author: stsp
Date: Wed Oct 12 14:18:01 2016
New Revision: 1764473
URL: http://svn.apache.org/viewvc?rev=1764473=rev
Log:
Remove variables which are written but not used in any way.
* subversion/libsvn_client/conflicts.c:
(conflict_tree_get_incoming_description_generic,
Author: ivan
Revision: 1764473
Modified property: svn:log
Modified: svn:log at Wed Oct 12 14:28:32 2016
--
--- svn:log (original)
+++ svn:log Wed Oct 12 14:28:32 2016
@@ -6,6 +6,6 @@ Remove variables which are written but
Author: stefan2
Date: Wed Oct 12 15:38:15 2016
New Revision: 1764482
URL: http://svn.apache.org/viewvc?rev=1764482=rev
Log:
On the authzperf branch:
* subversion/libsvn_repos/authz.c
(add_next_node): Refine commentary. No functional change.
Modified:
Author: stefan2
Date: Wed Oct 12 15:46:37 2016
New Revision: 1764483
URL: http://svn.apache.org/viewvc?rev=1764483=rev
Log:
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"
Author: stsp
Date: Wed Oct 12 12:34:18 2016
New Revision: 1764447
URL: http://svn.apache.org/viewvc?rev=1764447=rev
Log:
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):
Author: jcorvel
Date: Wed Oct 12 12:53:08 2016
New Revision: 1764452
URL: http://svn.apache.org/viewvc?rev=1764452=rev
Log:
Followup for r1764451: remove two unused variables from test.
* subversion/tests/cmdline/depth_tests.py
(fold_tree_with_deleted_moved_items): Remove unused variables.
Author: jcorvel
Date: Wed Oct 12 12:49:49 2016
New Revision: 1764451
URL: http://svn.apache.org/viewvc?rev=1764451=rev
Log:
Add an XFail test for issue #4636 (Making working copy sparse loses local
deletes / moves).
* subversion/tests/cmdline/depth_tests.py
Author: stefan2
Date: Wed Oct 12 12:24:39 2016
New Revision: 1764443
URL: http://svn.apache.org/viewvc?rev=1764443=rev
Log:
* STATUS:
Move the r1721488 group to "Approved"; bindings need just 2 votes.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
Author: kotkov
Date: Wed Oct 12 12:29:13 2016
New Revision: 176
URL: http://svn.apache.org/viewvc?rev=176=rev
Log:
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 ...
Author: rhuijben
Date: Wed Oct 12 12:56:02 2016
New Revision: 1764453
URL: http://svn.apache.org/viewvc?rev=1764453=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(tc_editor_merge_local_file_change): Don't pass unnecessary
optional argument.
Modified:
Author: stsp
Date: Wed Oct 12 13:32:58 2016
New Revision: 1764465
URL: http://svn.apache.org/viewvc?rev=1764465=rev
Log:
* 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.
Author: stsp
Date: Wed Oct 12 13:52:16 2016
New Revision: 1764470
URL: http://svn.apache.org/viewvc?rev=1764470=rev
Log:
* 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.
Author: kotkov
Date: Wed Oct 12 13:45:47 2016
New Revision: 1764468
URL: http://svn.apache.org/viewvc?rev=1764468=rev
Log:
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
Author: ivan
Date: Wed Oct 12 20:13:24 2016
New Revision: 1764536
URL: http://svn.apache.org/viewvc?rev=1764536=rev
Log:
* STATUS: Veto r1759116 group.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
Author: jcorvel
Date: Wed Oct 12 15:13:07 2016
New Revision: 1764480
URL: http://svn.apache.org/viewvc?rev=1764480=rev
Log:
* STATUS: Vote for and approve r1721285.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
Author: svn-role
Date: Thu Oct 13 04:00:49 2016
New Revision: 1764571
URL: http://svn.apache.org/viewvc?rev=1764571=rev
Log:
Merge r1722164 from trunk:
* r1722164
Filter out -Wdate-time from SWIG_CPPFLAGS
Justification:
Fixes bindings build failure when -Wdate-time is present in
Author: svn-role
Date: Thu Oct 13 04:01:13 2016
New Revision: 1764574
URL: http://svn.apache.org/viewvc?rev=1764574=rev
Log:
Merge r1721285 from trunk:
* r1721285
Quadruple the maximum cacheable directory size in FSFS.
Justification:
Not caching large directories has a massive impact
Author: svn-role
Date: Thu Oct 13 04:00:54 2016
New Revision: 1764572
URL: http://svn.apache.org/viewvc?rev=1764572=rev
Log:
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
Author: svn-role
Date: Thu Oct 13 04:00:42 2016
New Revision: 1764568
URL: http://svn.apache.org/viewvc?rev=1764568=rev
Log:
Merge r1764034 from trunk:
* r1764034
Use 'Apache Software Foundation' instead of 'http://subversion.apache.org'
as CompanyName/Publisher for Windows executables.
Author: svn-role
Date: Thu Oct 13 04:00:33 2016
New Revision: 1764566
URL: http://svn.apache.org/viewvc?rev=1764566=rev
Log:
Remove the '1.8.x-r1702299' branch, merged in r1764565.
Removed:
subversion/branches/1.8.x-r1702299/
Author: svn-role
Date: Thu Oct 13 04:00:17 2016
New Revision: 1764565
URL: http://svn.apache.org/viewvc?rev=1764565=rev
Log:
Merge the 1.8.x-r1702299 branch:
* r1702299, r1702300, r1702397, r1702407, r1702565
Handle merging to local add as error instead of segfault.
Justification:
Author: svn-role
Date: Thu Oct 13 04:00:37 2016
New Revision: 1764567
URL: http://svn.apache.org/viewvc?rev=1764567=rev
Log:
Merge r1763934 from trunk:
* r1763934
Add the OSX 10.12 commercial name for 'svn --version --verbose'.
Justification:
Very minor change makes SVN look slightly
Author: svn-role
Date: Thu Oct 13 04:00:45 2016
New Revision: 1764569
URL: http://svn.apache.org/viewvc?rev=1764569=rev
Log:
Merge r1763934 from trunk:
* r1763934
Add the OSX 10.12 commercial name for 'svn --version --verbose'.
Justification:
Very minor change makes SVN look slightly
Author: svn-role
Date: Thu Oct 13 04:01:10 2016
New Revision: 1764573
URL: http://svn.apache.org/viewvc?rev=1764573=rev
Log:
Remove the '1.9.x-r1721488' branch, merged in r1764572.
Removed:
subversion/branches/1.9.x-r1721488/
Author: svn-role
Date: Thu Oct 13 04:00:47 2016
New Revision: 1764570
URL: http://svn.apache.org/viewvc?rev=1764570=rev
Log:
Merge r1764034 from trunk:
* r1764034
Use 'Apache Software Foundation' instead of 'http://subversion.apache.org'
as CompanyName/Publisher for Windows executables.
46 matches
Mail list logo