Author: stsp
Date: Sat Feb 11 16:07:06 2017
New Revision: 1782614
URL: http://svn.apache.org/viewvc?rev=1782614&view=rev
Log:
Fix a crash during init in libsvn_repos with pool debugging enabled.
* subversion/libsvn_repos/authz.c
(synchronized_authz_initialize): With APR_POOL_DEBUG,
Author: stsp
Date: Sat Feb 11 15:23:18 2017
New Revision: 1782612
URL: http://svn.apache.org/viewvc?rev=1782612&view=rev
Log:
Fix a library path problem in my custom build script.
* tools/dev/unix-build/Makefile.svn: Fix build problem with Python
which broke the sqlite3 Python import
Author: stsp
Date: Fri Feb 10 15:10:35 2017
New Revision: 1782479
URL: http://svn.apache.org/viewvc?rev=1782479&view=rev
Log:
Git-style diffs are supposed to provide repos-root relative paths to
avoid issues with ambiguity when such diffs are shared with others.
However, 'renamed from/
Author: stsp
Date: Fri Feb 10 13:44:09 2017
New Revision: 1782469
URL: http://svn.apache.org/viewvc?rev=1782469&view=rev
Log:
* publish/roadmap.html: Fix wrong link.
Modified:
subversion/site/publish/roadmap.html
Modified: subversion/site/publish/roadmap.html
URL:
http://svn.apache
Author: stsp
Date: Fri Feb 10 13:42:14 2017
New Revision: 1782467
URL: http://svn.apache.org/viewvc?rev=1782467&view=rev
Log:
* publish/roadmap.html: Stylistic tweaks.
Modified:
subversion/site/publish/roadmap.html
Modified: subversion/site/publish/roadmap.html
URL:
http://svn.apache
Author: stsp
Date: Fri Feb 10 13:40:50 2017
New Revision: 1782466
URL: http://svn.apache.org/viewvc?rev=1782466&view=rev
Log:
* site/publish/roadmap.html: Let this page catch up with current affairs.
Modified:
subversion/site/publish/roadmap.html
Modified: subversion/site/pub
Author: stsp
Date: Fri Feb 10 12:32:00 2017
New Revision: 1782460
URL: http://svn.apache.org/viewvc?rev=1782460&view=rev
Log:
* release-notes/1.10.html: Fix wrong link.
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subversion/site/publish/docs/release-notes/
Author: stsp
Date: Fri Feb 10 12:30:59 2017
New Revision: 1782459
URL: http://svn.apache.org/viewvc?rev=1782459&view=rev
Log:
* site/public/docs/release-notes/1.10.html:
Add an empty section for the authzperf feature.
Modified:
subversion/site/publish/docs/release-notes/1.10.
Author: stsp
Date: Fri Feb 10 12:09:16 2017
New Revision: 1782456
URL: http://svn.apache.org/viewvc?rev=1782456&view=rev
Log:
* notes/resolve-moves: In an example, give a move target a better name to
make it easier to recognize.
Modified:
subversion/trunk/notes/resolve-moves
Modi
Author: stsp
Date: Fri Feb 10 11:40:51 2017
New Revision: 1782453
URL: http://svn.apache.org/viewvc?rev=1782453&view=rev
Log:
Avoid an unneccessary new RA session in the resolver.
* subversion/libsvn_client/conflicts.c
(find_yca): Add ra_session paramater which can be NULL (same semantic
Author: stsp
Date: Fri Feb 10 11:28:03 2017
New Revision: 1782452
URL: http://svn.apache.org/viewvc?rev=1782452&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(resolve_incoming_move_dir_merge): Improve error message shown if common
ancestor can't be found: Show the exact r
Author: stsp
Date: Fri Feb 10 09:43:05 2017
New Revision: 1782443
URL: http://svn.apache.org/viewvc?rev=1782443&view=rev
Log:
* site/publish/docs/release-notes/1.10.html: Mention limitations of move
detection as implemented in the new conflict resolver.
Modified:
subversion/site/pub
Author: stsp
Date: Thu Feb 9 18:08:58 2017
New Revision: 1782376
URL: http://svn.apache.org/viewvc?rev=1782376&view=rev
Log:
* CHANGES: Consistent capitalization of entries and other small tweaks.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: stsp
Date: Thu Feb 9 18:02:18 2017
New Revision: 1782375
URL: http://svn.apache.org/viewvc?rev=1782375&view=rev
Log:
* CHANGES: typo
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=178237
Author: stsp
Date: Thu Feb 9 17:58:19 2017
New Revision: 1782374
URL: http://svn.apache.org/viewvc?rev=1782374&view=rev
Log:
* CHANGES: Link to 1.10 release notes.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/t
Author: stsp
Date: Thu Feb 9 16:43:29 2017
New Revision: 1782368
URL: http://svn.apache.org/viewvc?rev=1782368&view=rev
Log:
* CHANGES: In the 1.10 section, add missing quotes around commands and options.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: stsp
Date: Thu Feb 9 16:38:31 2017
New Revision: 1782367
URL: http://svn.apache.org/viewvc?rev=1782367&view=rev
Log:
* CHANGES: Move items into more appropriate sections and sort a bit by topic.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: stsp
Date: Thu Feb 9 16:29:09 2017
New Revision: 1782365
URL: http://svn.apache.org/viewvc?rev=1782365&view=rev
Log:
* CHANGES: Add more items to the 1.10 section. I have no done one full pass
over trunk's history back down to r1660548. Additional review and checking
of
Author: stsp
Date: Thu Feb 9 13:32:55 2017
New Revision: 1782328
URL: http://svn.apache.org/viewvc?rev=1782328&view=rev
Log:
* CHANGES: More items for 1.10, covering history back up to end of August 2015.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: stsp
Date: Tue Feb 7 14:57:17 2017
New Revision: 1782003
URL: http://svn.apache.org/viewvc?rev=1782003&view=rev
Log:
* CHANGES: Update 1.10 section with relevant items not backported to 1.9.x,
covering the time frame from today back up to the beginning of May 2016.
Modi
Author: stsp
Date: Tue Feb 7 12:06:07 2017
New Revision: 1781991
URL: http://svn.apache.org/viewvc?rev=1781991&view=rev
Log:
* release-notes/1.10.html: Add a case where the resolver handles a
deletion as a local change.
Modified:
subversion/site/publish/docs/release-notes/1.10.
Author: stsp
Date: Mon Feb 6 13:53:58 2017
New Revision: 1781900
URL: http://svn.apache.org/viewvc?rev=1781900&view=rev
Log:
* tools/buildbot/slaves/bb-openbsd/bb-openbsd/svncheck-bindings.sh:
Fix check for success of Ruby tests which had stopped working because
the last line of the
Author: stsp
Date: Mon Feb 6 12:32:31 2017
New Revision: 1781890
URL: http://svn.apache.org/viewvc?rev=1781890&view=rev
Log:
* CHANGES: Add an empty skeleton section for 1.10.0.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/vi
Author: stsp
Date: Mon Feb 6 12:08:49 2017
New Revision: 1781889
URL: http://svn.apache.org/viewvc?rev=1781889&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(init_wc_move_targets, follow_move_chains): Move these functions further up
in the file to avoid a forward declara
Author: stsp
Date: Mon Feb 6 12:06:21 2017
New Revision: 1781887
URL: http://svn.apache.org/viewvc?rev=1781887&view=rev
Log:
Init working copy move targets in incoming-delete conflict details earlier.
They were initialized when conflict options were requested. If the conflict
description
Author: stsp
Date: Mon Feb 6 11:53:39 2017
New Revision: 1781883
URL: http://svn.apache.org/viewvc?rev=1781883&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(describe_incoming_deletion_upon_update,
describe_incoming_deletion_upon_merge): Fix indentation.
Modified:
subver
Author: stsp
Date: Mon Feb 6 11:50:29 2017
New Revision: 1781882
URL: http://svn.apache.org/viewvc?rev=1781882&view=rev
Log:
Add another helper function to the conflict resolver.
* subversion/libsvn_client/conflicts.c
(init_wc_move_targets): New he
Author: stsp
Date: Mon Feb 6 11:24:33 2017
New Revision: 1781880
URL: http://svn.apache.org/viewvc?rev=1781880&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(resolve_incoming_move_file_text_merge, resolve_incoming_move_dir_merge,
describe_incoming_move_merge_conflict_op
Author: stsp
Date: Mon Feb 6 11:14:52 2017
New Revision: 1781879
URL: http://svn.apache.org/viewvc?rev=1781879&view=rev
Log:
Re-do r1781862 correctly.
* subversion/libsvn_client/conflicts.c
(configure_option_incoming_move_file_merge,
configure_option_incoming_dir_merge):
Author: stsp
Date: Mon Feb 6 11:08:28 2017
New Revision: 1781877
URL: http://svn.apache.org/viewvc?rev=1781877&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(get_moved_to_repos_relpath): Also check the working copy targets map if
no move target path has been selected yet. Requir
Author: stsp
Revision: 1781862
Modified property: svn:log
Modified: svn:log at Mon Feb 6 10:50:52 2017
--
--- svn:log (original)
+++ svn:log Mon Feb 6 10:50:52 2017
@@ -1,3 +1,4 @@
+[ Note from the future: Reverted in
Author: stsp
Date: Mon Feb 6 10:50:21 2017
New Revision: 1781872
URL: http://svn.apache.org/viewvc?rev=1781872&view=rev
Log:
Revert r1781862 for now. That commit had a silly bug where it assigned a
local abspath to a variable which is supposed to hold a repository relpath.
Modi
Author: stsp
Date: Mon Feb 6 10:22:59 2017
New Revision: 1781867
URL: http://svn.apache.org/viewvc?rev=1781867&view=rev
Log:
Follow-up to r1781855:
* subversion/libsvn_client/conflicts.c
(describe_incoming_deletion_upon_update): Remove now unused code.
Modified:
subversion/t
Author: stsp
Date: Mon Feb 6 10:13:17 2017
New Revision: 1781862
URL: http://svn.apache.org/viewvc?rev=1781862&view=rev
Log:
Introduce another helper function in the conflict resolver.
* subversion/libsvn_client/conflicts.c
(select_default_move_target_abspath): New helper function w
Author: stsp
Date: Mon Feb 6 09:35:25 2017
New Revision: 1781855
URL: http://svn.apache.org/viewvc?rev=1781855&view=rev
Log:
Introduce a new helper function in the conflict resolver.
* subversion/libsvn_client/conflicts.c
(get_moved_to_repos_relpath): New helper function which encapsul
Author: stsp
Date: Sat Feb 4 18:47:59 2017
New Revision: 1781697
URL: http://svn.apache.org/viewvc?rev=1781697&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(handle_tree_conflict): Update conflict description if the user chooses
an alternative move target path.
Modi
Author: stsp
Date: Sat Feb 4 18:47:13 2017
New Revision: 1781696
URL: http://svn.apache.org/viewvc?rev=1781696&view=rev
Log:
If the user selects a repository-side move target for a conflict,
make conflict descriptions show this move target instead of always
showing the first possible
Author: stsp
Date: Sat Feb 4 18:14:01 2017
New Revision: 1781692
URL: http://svn.apache.org/viewvc?rev=1781692&view=rev
Log:
In the conflict resolver, move duplicated code into a common helper function.
* subversion/libsvn_client/conflicts.c
(describe_incoming_move_merge_conflict_option):
Author: stsp
Date: Sat Feb 4 13:22:59 2017
New Revision: 1781667
URL: http://svn.apache.org/viewvc?rev=1781667&view=rev
Log:
Improve documentation of aconflict resolver API function.
* subversion/include/svn_client.h
(svn_client_conflict_option_set_moved_to_repos_relpath): Explain w
Author: stsp
Date: Sat Feb 4 11:11:50 2017
New Revision: 1781656
URL: http://svn.apache.org/viewvc?rev=1781656&view=rev
Log:
* STATUS: Nominate r1781655.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subver
Author: stsp
Date: Sat Feb 4 11:10:34 2017
New Revision: 1781655
URL: http://svn.apache.org/viewvc?rev=1781655&view=rev
Log:
* subversion/libsvn_fs_fs/rep-cache.c
(svn_fs_fs__open_rep_cache): If we can't open the rep-cache, include the
full path to the rep-cache database we tried t
Author: stsp
Date: Sat Feb 4 10:28:42 2017
New Revision: 1781651
URL: http://svn.apache.org/viewvc?rev=1781651&view=rev
Log:
* tools/buildbot/slaves/bb-openbsd/svnbuild.sh,
tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh: Re-enable Perl
bindings on the bb-openbsd buildbot. The lin
Author: stsp
Revision: 1781588
Modified property: svn:log
Modified: svn:log at Fri Feb 3 22:38:35 2017
--
--- svn:log (original)
+++ svn:log Fri Feb 3 22:38:35 2017
@@ -1,9 +1,9 @@
-Pass explicit linker flags to the
Author: stsp
Date: Fri Feb 3 22:35:23 2017
New Revision: 1781614
URL: http://svn.apache.org/viewvc?rev=1781614&view=rev
Log:
Follow-up to r1781588:
* subversion/bindings/swig/perl/native/Makefile.PL.in
(config): Obtain the value for LDDLFLAGS from Perl's Config module.
Should fix
Author: stsp
Date: Fri Feb 3 19:47:11 2017
New Revision: 1781590
URL: http://svn.apache.org/viewvc?rev=1781590&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update gettext to 0.19.8.1.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools
Author: stsp
Date: Fri Feb 3 19:32:36 2017
New Revision: 1781589
URL: http://svn.apache.org/viewvc?rev=1781589&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update python to 2.7.13.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 19:03:53 2017
New Revision: 1781588
URL: http://svn.apache.org/viewvc?rev=1781588&view=rev
Log:
Pass explicit linker flags to the perl bindings build.
This unbreaks 'make check-swig-pl' in cases where the libsvn libraries
being tested are not installed
Author: stsp
Date: Fri Feb 3 14:34:26 2017
New Revision: 1781558
URL: http://svn.apache.org/viewvc?rev=1781558&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Fix gettext-clean target.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 14:15:23 2017
New Revision: 1781551
URL: http://svn.apache.org/viewvc?rev=1781551&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update ruby to 2.1.10 (long overdue...)
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/t
Author: stsp
Date: Fri Feb 3 11:51:23 2017
New Revision: 1781544
URL: http://svn.apache.org/viewvc?rev=1781544&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Merge serf ssl build fixes.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools
Author: stsp
Date: Fri Feb 3 11:10:06 2017
New Revision: 1781536
URL: http://svn.apache.org/viewvc?rev=1781536&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update libmagic to 5.28.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 10:56:51 2017
New Revision: 1781534
URL: http://svn.apache.org/viewvc?rev=1781534&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update to sqlite 3160200.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 10:43:21 2017
New Revision: 1781530
URL: http://svn.apache.org/viewvc?rev=1781530&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update serf to 1.3.9.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 10:40:29 2017
New Revision: 1781529
URL: http://svn.apache.org/viewvc?rev=1781529&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update neon to 0.30.2.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 10:34:11 2017
New Revision: 1781527
URL: http://svn.apache.org/viewvc?rev=1781527&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update GNU iconv to 1.15.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 10:22:36 2017
New Revision: 1781523
URL: http://svn.apache.org/viewvc?rev=1781523&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update APR-util to 1.5.4.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 10:19:26 2017
New Revision: 1781522
URL: http://svn.apache.org/viewvc?rev=1781522&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update APR to 1.5.2.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 10:12:17 2017
New Revision: 1781521
URL: http://svn.apache.org/viewvc?rev=1781521&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update httpd to 2.2.32.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/
Author: stsp
Date: Fri Feb 3 08:54:04 2017
New Revision: 1781510
URL: http://svn.apache.org/viewvc?rev=1781510&view=rev
Log:
* STATUS: Nominate r1781507.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subver
Author: stsp
Date: Fri Feb 3 08:50:33 2017
New Revision: 1781507
URL: http://svn.apache.org/viewvc?rev=1781507&view=rev
Log:
Fix a NULL deref in libsvn_repos which makes svndumpfilter crash.
* subversion/libsvn_repos/dump.c
(svn_repos__dump_revision_record): Don't try to print
Author: stsp
Date: Mon Jan 30 15:13:52 2017
New Revision: 1780921
URL: http://svn.apache.org/viewvc?rev=1780921&view=rev
Log:
Improve wording in help text of 'svn copy' and 'svn move'.
* subversion/svn/svn.c
(svn_cl__cmd_table): Explain more clearly what happens when
Author: stsp
Date: Sat Jan 28 14:37:33 2017
New Revision: 1780702
URL: http://svn.apache.org/viewvc?rev=1780702&view=rev
Log:
In the conflict resolver, deal with NULL author names which may occur in
some circumstances.
Found by: steveking
* subversion/libsvn_client/conflic
Author: stsp
Revision: 1780259
Modified property: svn:log
Modified: svn:log at Fri Jan 27 12:52:21 2017
--
--- svn:log (original)
+++ svn:log Fri Jan 27 12:52:21 2017
@@ -2,6 +2,7 @@ Fix a segfault in the conflict
Author: stsp
Date: Fri Jan 27 12:49:58 2017
New Revision: 1780551
URL: http://svn.apache.org/viewvc?rev=1780551&view=rev
Log:
Add a regression test for the bug fixed in r1780259.
* subversion/tests/libsvn_client/conflicts-test.c
(test_cherry_pick_moved_file_with_propdel, test_funcs): New
Author: stsp
Date: Wed Jan 25 19:37:56 2017
New Revision: 1780259
URL: http://svn.apache.org/viewvc?rev=1780259&view=rev
Log:
Fix a segfault in the conflict resolver.
Found while playing around with the FreeBSD repo.
I have not yet managed to produce an isolated test case, so no test for
Author: stsp
Date: Wed Jan 25 17:53:05 2017
New Revision: 1780250
URL: http://svn.apache.org/viewvc?rev=1780250&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(resolve_incoming_move_dir_merge): Handle the case where yca_loc is NULL.
Modified:
subversion/trunk/subversion/libsvn_cl
Author: stsp
Date: Wed Jan 25 17:12:28 2017
New Revision: 1780245
URL: http://svn.apache.org/viewvc?rev=1780245&view=rev
Log:
Initalize various conflict resolver baton structs which live on the stack.
Fixes a crash observed while running some test merges.
* subversion/libsvn_client/conflic
Author: stsp
Date: Wed Jan 25 17:02:01 2017
New Revision: 1780240
URL: http://svn.apache.org/viewvc?rev=1780240&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(find_moves_in_revision_range): Fix error leak.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modi
Author: stsp
Date: Wed Jan 25 16:59:23 2017
New Revision: 1780238
URL: http://svn.apache.org/viewvc?rev=1780238&view=rev
Log:
* subversion/svn/merge-cmd.c
(svn_cl__merge): If a merge failed due to conflicts, and all conflicts
get resolved by the conflict resolver, rerun the same merg
Author: stsp
Date: Wed Jan 25 15:14:46 2017
New Revision: 1780207
URL: http://svn.apache.org/viewvc?rev=1780207&view=rev
Log:
* release-notes/1.10.html
(conflict-resolver): Simplify the table by removing the node kind
column which has the same value in every row. Explain this in
Author: stsp
Date: Wed Jan 25 15:04:32 2017
New Revision: 1780201
URL: http://svn.apache.org/viewvc?rev=1780201&view=rev
Log:
* release-notes/1.10.html
(conflict-resolver): Improve wording in the table columns which
describe local and incoming changes.
Modified:
subversion/site/pub
Author: stsp
Date: Wed Jan 25 14:58:47 2017
New Revision: 1780200
URL: http://svn.apache.org/viewvc?rev=1780200&view=rev
Log:
* release-notes/1.10.html: Add missing
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subversion/site/publish/docs/release-notes/1.10.
Author: stsp
Date: Wed Jan 25 14:57:47 2017
New Revision: 1780199
URL: http://svn.apache.org/viewvc?rev=1780199&view=rev
Log:
* release-notes/1.10.html: Add a note on top of the page to tell people
that 1.10 is not released yet.
Suggested by: astieger
Modified:
subversion/site/pub
Author: stsp
Date: Wed Jan 25 14:47:15 2017
New Revision: 1780197
URL: http://svn.apache.org/viewvc?rev=1780197&view=rev
Log:
* release-notes/1.10.html: Fix stale links on top of page.
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subversion/site/publish/
Author: stsp
Date: Wed Jan 25 14:43:03 2017
New Revision: 1780193
URL: http://svn.apache.org/viewvc?rev=1780193&view=rev
Log:
* release-notes/1.10.html: spacing
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subversion/site/publish/docs/release-notes/1.10.html
Author: stsp
Date: Wed Jan 25 14:41:03 2017
New Revision: 1780191
URL: http://svn.apache.org/viewvc?rev=1780191&view=rev
Log:
* release-notes/1.10.html: Add a section about the new conflict resolver.
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subversion/
Author: stsp
Date: Wed Jan 25 12:56:12 2017
New Revision: 1780183
URL: http://svn.apache.org/viewvc?rev=1780183&view=rev
Log:
* release-notes/1.10.html: Add a skeleton section for new conflict resolver.
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subversion/
Author: stsp
Date: Wed Jan 25 12:52:39 2017
New Revision: 1780182
URL: http://svn.apache.org/viewvc?rev=1780182&view=rev
Log:
* release-notes/1.10.html: The release following 1.10 will be numbered 1.11.
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subversion/
Author: stsp
Date: Wed Jan 25 12:51:26 2017
New Revision: 1780181
URL: http://svn.apache.org/viewvc?rev=1780181&view=rev
Log:
* site/publish/docs/release-notes/1.10.html: Remove a TODO item which is done.
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subver
Author: stsp
Date: Wed Jan 25 12:50:05 2017
New Revision: 1780180
URL: http://svn.apache.org/viewvc?rev=1780180&view=rev
Log:
* site/publish/docs/release-notes/1.10.html: Remove items copied over
from 1.9 release notes which do not apply to 1.10.
Modified:
subversion/site/publish/
Author: stsp
Date: Tue Jan 24 11:00:42 2017
New Revision: 1780062
URL: http://svn.apache.org/viewvc?rev=1780062&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(build_tree_conflict_options): Assign dynamic option codes to unknown
conflict options. This allows the 'svn'
Author: stsp
Date: Tue Jan 24 10:56:07 2017
New Revision: 1780061
URL: http://svn.apache.org/viewvc?rev=1780061&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(find_option_by_builtin): Fix docstring.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subver
Author: stsp
Date: Tue Jan 24 10:40:45 2017
New Revision: 1780054
URL: http://svn.apache.org/viewvc?rev=1780054&view=rev
Log:
Make the 'quit' command at the svn resolve conflict prompt work again.
It was broken in r1779687.
* subversion/svn/resolve-cmd.c
(conflict_walker): If the
Author: stsp
Date: Mon Jan 23 16:01:49 2017
New Revision: 1779949
URL: http://svn.apache.org/viewvc?rev=1779949&view=rev
Log:
* STATUS: Nominate r1779948.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subver
Author: stsp
Date: Mon Jan 23 15:54:37 2017
New Revision: 1779948
URL: http://svn.apache.org/viewvc?rev=1779948&view=rev
Log:
* subversion/libsvn_client/copy.c
(verify_wc_dsts): Provide a better error message when a copy/move operation
attempts to use an existing, but unversioned, ta
Author: stsp
Date: Fri Jan 20 23:39:16 2017
New Revision: 1779691
URL: http://svn.apache.org/viewvc?rev=1779691&view=rev
Log:
Another follow-up to 1779687:
* subversion/svn/resolve-cmd.c
(conflict_walker_baton): Don't store pointers to booleans here.
Instead, store the booleans
Author: stsp
Date: Fri Jan 20 23:36:09 2017
New Revision: 1779690
URL: http://svn.apache.org/viewvc?rev=1779690&view=rev
Log:
Follow-up to 1779687: Fix postponing conflicts.
* subversion/svn/conflict-callbacks.c
(svn_cl__resolve_conflict): Don't mark conflicts resolved if the user
Author: stsp
Date: Fri Jan 20 22:52:55 2017
New Revision: 1779689
URL: http://svn.apache.org/viewvc?rev=1779689&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(handle_tree_conflict_resolution_failure): Rename local variable
'dup_abspath' to 'tc_abspath' as u
Author: stsp
Date: Fri Jan 20 22:46:09 2017
New Revision: 1779688
URL: http://svn.apache.org/viewvc?rev=1779688&view=rev
Log:
* subversion/svn/svn.c
(svn_cl__cmd_table): Add missing whitespace.
Modified:
subversion/trunk/subversion/svn/svn.c
Modified: subversion/trunk/subversion/svn/s
Author: stsp
Date: Fri Jan 20 22:45:09 2017
New Revision: 1779687
URL: http://svn.apache.org/viewvc?rev=1779687&view=rev
Log:
Reintroduce the svn_client_conflict_walk() API.
This new implementation is based on the conflict walk we implemented in
the 'svn' command line client. Th
Author: stsp
Date: Fri Jan 20 16:14:27 2017
New Revision: 1779643
URL: http://svn.apache.org/viewvc?rev=1779643&view=rev
Log:
Add anew resolver tests for merging a locally added directory which clashes
with an incoming directory upon update, which tests behaviour with unversioned
obstruct
Author: stsp
Date: Fri Jan 20 16:07:33 2017
New Revision: 1779642
URL: http://svn.apache.org/viewvc?rev=1779642&view=rev
Log:
Extend resolver tests for merging a locally added directory which clashes with
an incoming directory upon update, by also testing behaviour with properties
and
Author: stsp
Date: Fri Jan 20 15:04:34 2017
New Revision: 1779633
URL: http://svn.apache.org/viewvc?rev=1779633&view=rev
Log:
Add a basic resolver test for merging a locally added directory which
clashes with an incoming directory upon update.
* subversion/tests/libsvn_client/conflicts-te
Author: stsp
Date: Fri Jan 20 14:58:40 2017
New Revision: 1779631
URL: http://svn.apache.org/viewvc?rev=1779631&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(update_locally_added_node): Remove local variable 'local_relpath' which was
a copy of 'nb->local_
Author: stsp
Date: Fri Jan 20 14:56:29 2017
New Revision: 1779630
URL: http://svn.apache.org/viewvc?rev=1779630&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(update_locally_added_node): Pass an absolute path to the
svn_io_file_checksum2() function instead of passing a rela
Author: stsp
Date: Wed Jan 18 17:44:23 2017
New Revision: 1779360
URL: http://svn.apache.org/viewvc?rev=1779360&view=rev
Log:
Fix test fallout from r1779357:
* subversion/libsvn_client/conflicts-test.c
(create_wc_with_dir_add_vs_dir_add_update_conflict): Add the new resolver
option
Author: stsp
Date: Wed Jan 18 17:14:19 2017
New Revision: 1779357
URL: http://svn.apache.org/viewvc?rev=1779357&view=rev
Log:
Add an implementation of a new resolver option which resolves "incoming add
vs local add upon update" by merging the local and incoming directory trees.
Author: stsp
Date: Tue Jan 17 13:25:27 2017
New Revision: 1779189
URL: http://svn.apache.org/viewvc?rev=1779189&view=rev
Log:
* subversion/tests/libsvn_repos: Add 'authz-test' to ignore list.
Modified:
subversion/trunk/subversion/tests/libsvn_repos/ (props changed)
Propchan
Author: stsp
Date: Tue Jan 17 13:23:34 2017
New Revision: 1779188
URL: http://svn.apache.org/viewvc?rev=1779188&view=rev
Log:
Fix a compiler warning about an unused variable:
subversion/mod_authz_svn/mod_authz_svn.c: In function 'get_ac
Modified: subversion/trunk/subversion/po/it.po
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/po/it.po?rev=1778776&r1=1778775&r2=1778776&view=diff
==
--- subversion/trunk/subversion/po/it.po (original)
+++
801 - 900 of 5343 matches
Mail list logo
