Author: stsp
Date: Thu Feb 9 18:02:18 2017
New Revision: 1782375
URL: http://svn.apache.org/viewvc?rev=1782375=rev
Log:
* CHANGES: typo
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1782375=1782374
Author: stsp
Date: Thu Feb 9 17:58:19 2017
New Revision: 1782374
URL: http://svn.apache.org/viewvc?rev=1782374=rev
Log:
* CHANGES: Link to 1.10 release notes.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES
Author: stsp
Date: Thu Feb 9 16:43:29 2017
New Revision: 1782368
URL: http://svn.apache.org/viewvc?rev=1782368=rev
Log:
* CHANGES: In the 1.10 section, add missing quotes around commands and options.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http
Author: stsp
Date: Thu Feb 9 16:38:31 2017
New Revision: 1782367
URL: http://svn.apache.org/viewvc?rev=1782367=rev
Log:
* CHANGES: Move items into more appropriate sections and sort a bit by topic.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http
Author: stsp
Date: Thu Feb 9 16:29:09 2017
New Revision: 1782365
URL: http://svn.apache.org/viewvc?rev=1782365=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 items
Author: stsp
Date: Thu Feb 9 13:32:55 2017
New Revision: 1782328
URL: http://svn.apache.org/viewvc?rev=1782328=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:
http
Author: stsp
Date: Tue Feb 7 14:57:17 2017
New Revision: 1782003
URL: http://svn.apache.org/viewvc?rev=1782003=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.
Modified
Author: stsp
Date: Tue Feb 7 12:06:07 2017
New Revision: 1781991
URL: http://svn.apache.org/viewvc?rev=1781991=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.html
Modified
Author: stsp
Date: Mon Feb 6 13:53:58 2017
New Revision: 1781900
URL: http://svn.apache.org/viewvc?rev=1781900=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 Ruby test log
Author: stsp
Date: Mon Feb 6 12:32:31 2017
New Revision: 1781890
URL: http://svn.apache.org/viewvc?rev=1781890=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/viewvc/subversion
Author: stsp
Date: Mon Feb 6 12:08:49 2017
New Revision: 1781889
URL: http://svn.apache.org/viewvc?rev=1781889=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 declaration.
Modified
Author: stsp
Date: Mon Feb 6 12:06:21 2017
New Revision: 1781887
URL: http://svn.apache.org/viewvc?rev=1781887=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 was already
Author: stsp
Date: Mon Feb 6 11:53:39 2017
New Revision: 1781883
URL: http://svn.apache.org/viewvc?rev=1781883=rev
Log:
* subversion/libsvn_client/conflicts.c
(describe_incoming_deletion_upon_update,
describe_incoming_deletion_upon_merge): Fix indentation.
Modified:
subversion/trunk
Author: stsp
Date: Mon Feb 6 11:50:29 2017
New Revision: 1781882
URL: http://svn.apache.org/viewvc?rev=1781882=rev
Log:
Add another helper function to the conflict resolver.
* subversion/libsvn_client/conflicts.c
(init_wc_move_targets): New helper.
(configure_option_incoming_move_file_merge
Author: stsp
Date: Mon Feb 6 11:24:33 2017
New Revision: 1781880
URL: http://svn.apache.org/viewvc?rev=1781880=rev
Log:
* subversion/libsvn_client/conflicts.c
(resolve_incoming_move_file_text_merge, resolve_incoming_move_dir_merge,
describe_incoming_move_merge_conflict_option
Author: stsp
Date: Mon Feb 6 11:14:52 2017
New Revision: 1781879
URL: http://svn.apache.org/viewvc?rev=1781879=rev
Log:
Re-do r1781862 correctly.
* subversion/libsvn_client/conflicts.c
(configure_option_incoming_move_file_merge,
configure_option_incoming_dir_merge): Use
Author: stsp
Date: Mon Feb 6 11:08:28 2017
New Revision: 1781877
URL: http://svn.apache.org/viewvc?rev=1781877=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. Requires
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
Author: stsp
Date: Mon Feb 6 10:50:21 2017
New Revision: 1781872
URL: http://svn.apache.org/viewvc?rev=1781872=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.
Modified:
subversion
Author: stsp
Date: Mon Feb 6 10:22:59 2017
New Revision: 1781867
URL: http://svn.apache.org/viewvc?rev=1781867=rev
Log:
Follow-up to r1781855:
* subversion/libsvn_client/conflicts.c
(describe_incoming_deletion_upon_update): Remove now unused code.
Modified:
subversion/trunk/subversion
Author: stsp
Date: Mon Feb 6 10:13:17 2017
New Revision: 1781862
URL: http://svn.apache.org/viewvc?rev=1781862=rev
Log:
Introduce another helper function in the conflict resolver.
* subversion/libsvn_client/conflicts.c
(select_default_move_target_abspath): New helper function which selects
Author: stsp
Date: Mon Feb 6 09:35:25 2017
New Revision: 1781855
URL: http://svn.apache.org/viewvc?rev=1781855=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 encapsulates
Author: stsp
Date: Sat Feb 4 18:47:59 2017
New Revision: 1781697
URL: http://svn.apache.org/viewvc?rev=1781697=rev
Log:
* subversion/svn/conflict-callbacks.c
(handle_tree_conflict): Update conflict description if the user chooses
an alternative move target path.
Modified:
subversion
Author: stsp
Date: Sat Feb 4 18:47:13 2017
New Revision: 1781696
URL: http://svn.apache.org/viewvc?rev=1781696=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 move
Author: stsp
Date: Sat Feb 4 18:14:01 2017
New Revision: 1781692
URL: http://svn.apache.org/viewvc?rev=1781692=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): New
Author: stsp
Date: Sat Feb 4 13:22:59 2017
New Revision: 1781667
URL: http://svn.apache.org/viewvc?rev=1781667=rev
Log:
Improve documentation of aconflict resolver API function.
* subversion/include/svn_client.h
(svn_client_conflict_option_set_moved_to_repos_relpath): Explain which
Author: stsp
Date: Sat Feb 4 11:11:50 2017
New Revision: 1781656
URL: http://svn.apache.org/viewvc?rev=1781656=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/subversion/branches
Author: stsp
Date: Sat Feb 4 11:10:34 2017
New Revision: 1781655
URL: http://svn.apache.org/viewvc?rev=1781655=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 to open
Author: stsp
Date: Sat Feb 4 10:28:42 2017
New Revision: 1781651
URL: http://svn.apache.org/viewvc?rev=1781651=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 linking
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
Author: stsp
Date: Fri Feb 3 22:35:23 2017
New Revision: 1781614
URL: http://svn.apache.org/viewvc?rev=1781614=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 the Perl
Author: stsp
Date: Fri Feb 3 19:47:11 2017
New Revision: 1781590
URL: http://svn.apache.org/viewvc?rev=1781590=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/dev/unix
Author: stsp
Date: Fri Feb 3 19:32:36 2017
New Revision: 1781589
URL: http://svn.apache.org/viewvc?rev=1781589=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/unix-build
Author: stsp
Date: Fri Feb 3 19:03:53 2017
New Revision: 1781588
URL: http://svn.apache.org/viewvc?rev=1781588=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 in a standard
Author: stsp
Date: Fri Feb 3 14:34:26 2017
New Revision: 1781558
URL: http://svn.apache.org/viewvc?rev=1781558=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/unix
Author: stsp
Date: Fri Feb 3 14:15:23 2017
New Revision: 1781551
URL: http://svn.apache.org/viewvc?rev=1781551=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/trunk/tools
Author: stsp
Date: Fri Feb 3 11:51:23 2017
New Revision: 1781544
URL: http://svn.apache.org/viewvc?rev=1781544=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/dev/unix
Author: stsp
Date: Fri Feb 3 11:10:06 2017
New Revision: 1781536
URL: http://svn.apache.org/viewvc?rev=1781536=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/unix-build
Author: stsp
Date: Fri Feb 3 10:56:51 2017
New Revision: 1781534
URL: http://svn.apache.org/viewvc?rev=1781534=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/unix
Author: stsp
Date: Fri Feb 3 10:43:21 2017
New Revision: 1781530
URL: http://svn.apache.org/viewvc?rev=1781530=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/unix-build
Author: stsp
Date: Fri Feb 3 10:40:29 2017
New Revision: 1781529
URL: http://svn.apache.org/viewvc?rev=1781529=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/unix-build
Author: stsp
Date: Fri Feb 3 10:34:11 2017
New Revision: 1781527
URL: http://svn.apache.org/viewvc?rev=1781527=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/unix
Author: stsp
Date: Fri Feb 3 10:22:36 2017
New Revision: 1781523
URL: http://svn.apache.org/viewvc?rev=1781523=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/unix
Author: stsp
Date: Fri Feb 3 10:19:26 2017
New Revision: 1781522
URL: http://svn.apache.org/viewvc?rev=1781522=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/unix-build
Author: stsp
Date: Fri Feb 3 10:12:17 2017
New Revision: 1781521
URL: http://svn.apache.org/viewvc?rev=1781521=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/unix-build
Author: stsp
Date: Fri Feb 3 08:54:04 2017
New Revision: 1781510
URL: http://svn.apache.org/viewvc?rev=1781510=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/subversion/branches
Author: stsp
Date: Fri Feb 3 08:50:33 2017
New Revision: 1781507
URL: http://svn.apache.org/viewvc?rev=1781507=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 a Content-length
Author: stsp
Date: Mon Jan 30 15:13:52 2017
New Revision: 1780921
URL: http://svn.apache.org/viewvc?rev=1780921=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
copying/moving multiple
Author: stsp
Date: Sat Jan 28 14:37:33 2017
New Revision: 1780702
URL: http://svn.apache.org/viewvc?rev=1780702=rev
Log:
In the conflict resolver, deal with NULL author names which may occur in
some circumstances.
Found by: steveking
* subversion/libsvn_client/conflicts.c
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=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 test
Author: stsp
Date: Wed Jan 25 19:37:56 2017
New Revision: 1780259
URL: http://svn.apache.org/viewvc?rev=1780259=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 now
Author: stsp
Date: Wed Jan 25 17:53:05 2017
New Revision: 1780250
URL: http://svn.apache.org/viewvc?rev=1780250=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_client
Author: stsp
Date: Wed Jan 25 17:12:28 2017
New Revision: 1780245
URL: http://svn.apache.org/viewvc?rev=1780245=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/conflicts.c
Author: stsp
Date: Wed Jan 25 17:02:01 2017
New Revision: 1780240
URL: http://svn.apache.org/viewvc?rev=1780240=rev
Log:
* subversion/libsvn_client/conflicts.c
(find_moves_in_revision_range): Fix error leak.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified
Author: stsp
Date: Wed Jan 25 16:59:23 2017
New Revision: 1780238
URL: http://svn.apache.org/viewvc?rev=1780238=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 merge to continue
Author: stsp
Date: Wed Jan 25 15:14:46 2017
New Revision: 1780207
URL: http://svn.apache.org/viewvc?rev=1780207=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
Author: stsp
Date: Wed Jan 25 15:04:32 2017
New Revision: 1780201
URL: http://svn.apache.org/viewvc?rev=1780201=rev
Log:
* release-notes/1.10.html
(conflict-resolver): Improve wording in the table columns which
describe local and incoming changes.
Modified:
subversion/site/publish/docs
Author: stsp
Date: Wed Jan 25 14:58:47 2017
New Revision: 1780200
URL: http://svn.apache.org/viewvc?rev=1780200=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.html
URL
Author: stsp
Date: Wed Jan 25 14:57:47 2017
New Revision: 1780199
URL: http://svn.apache.org/viewvc?rev=1780199=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/publish/docs
Author: stsp
Date: Wed Jan 25 14:47:15 2017
New Revision: 1780197
URL: http://svn.apache.org/viewvc?rev=1780197=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/docs/release
Author: stsp
Date: Wed Jan 25 14:43:03 2017
New Revision: 1780193
URL: http://svn.apache.org/viewvc?rev=1780193=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
URL
Author: stsp
Date: Wed Jan 25 14:41:03 2017
New Revision: 1780191
URL: http://svn.apache.org/viewvc?rev=1780191=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/site/publish
Author: stsp
Date: Wed Jan 25 12:56:12 2017
New Revision: 1780183
URL: http://svn.apache.org/viewvc?rev=1780183=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/site
Author: stsp
Date: Wed Jan 25 12:52:39 2017
New Revision: 1780182
URL: http://svn.apache.org/viewvc?rev=1780182=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/site
Author: stsp
Date: Wed Jan 25 12:51:26 2017
New Revision: 1780181
URL: http://svn.apache.org/viewvc?rev=1780181=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: subversion/site
Author: stsp
Date: Wed Jan 25 12:50:05 2017
New Revision: 1780180
URL: http://svn.apache.org/viewvc?rev=1780180=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/docs/release
Author: stsp
Date: Tue Jan 24 11:00:42 2017
New Revision: 1780062
URL: http://svn.apache.org/viewvc?rev=1780062=rev
Log:
* subversion/svn/conflict-callbacks.c
(build_tree_conflict_options): Assign dynamic option codes to unknown
conflict options. This allows the 'svn' client to work against
Author: stsp
Date: Tue Jan 24 10:56:07 2017
New Revision: 1780061
URL: http://svn.apache.org/viewvc?rev=1780061=rev
Log:
* subversion/svn/conflict-callbacks.c
(find_option_by_builtin): Fix docstring.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk
Author: stsp
Date: Tue Jan 24 10:40:45 2017
New Revision: 1780054
URL: http://svn.apache.org/viewvc?rev=1780054=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 user wants to quit
Author: stsp
Date: Mon Jan 23 16:01:49 2017
New Revision: 1779949
URL: http://svn.apache.org/viewvc?rev=1779949=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/subversion/branches
Author: stsp
Date: Mon Jan 23 15:54:37 2017
New Revision: 1779948
URL: http://svn.apache.org/viewvc?rev=1779948=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, target
Author: stsp
Date: Fri Jan 20 23:39:16 2017
New Revision: 1779691
URL: http://svn.apache.org/viewvc?rev=1779691=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 directly
Author: stsp
Date: Fri Jan 20 23:36:09 2017
New Revision: 1779690
URL: http://svn.apache.org/viewvc?rev=1779690=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
wants
Author: stsp
Date: Fri Jan 20 22:52:55 2017
New Revision: 1779689
URL: http://svn.apache.org/viewvc?rev=1779689=rev
Log:
* subversion/libsvn_client/conflicts.c
(handle_tree_conflict_resolution_failure): Rename local variable
'dup_abspath' to 'tc_abspath' as used in elsewhere in this file
Author: stsp
Date: Fri Jan 20 22:46:09 2017
New Revision: 1779688
URL: http://svn.apache.org/viewvc?rev=1779688=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/svn.c
URL
Author: stsp
Date: Fri Jan 20 22:45:09 2017
New Revision: 1779687
URL: http://svn.apache.org/viewvc?rev=1779687=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. The command line client
Author: stsp
Date: Fri Jan 20 16:14:27 2017
New Revision: 1779643
URL: http://svn.apache.org/viewvc?rev=1779643=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
obstructions
Author: stsp
Date: Fri Jan 20 16:07:33 2017
New Revision: 1779642
URL: http://svn.apache.org/viewvc?rev=1779642=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 the behaviour
Author: stsp
Date: Fri Jan 20 15:04:34 2017
New Revision: 1779633
URL: http://svn.apache.org/viewvc?rev=1779633=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-test.c
Author: stsp
Date: Fri Jan 20 14:58:40 2017
New Revision: 1779631
URL: http://svn.apache.org/viewvc?rev=1779631=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_relpath', and just use
Author: stsp
Date: Fri Jan 20 14:56:29 2017
New Revision: 1779630
URL: http://svn.apache.org/viewvc?rev=1779630=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 relative path
Author: stsp
Date: Wed Jan 18 17:44:23 2017
New Revision: 1779360
URL: http://svn.apache.org/viewvc?rev=1779360=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 for merging
Author: stsp
Date: Wed Jan 18 17:14:19 2017
New Revision: 1779357
URL: http://svn.apache.org/viewvc?rev=1779357=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.
It mirror
Author: stsp
Date: Tue Jan 17 13:25:27 2017
New Revision: 1779189
URL: http://svn.apache.org/viewvc?rev=1779189=rev
Log:
* subversion/tests/libsvn_repos: Add 'authz-test' to ignore list.
Modified:
subversion/trunk/subversion/tests/libsvn_repos/ (props changed)
Propchange: subversion/trunk
Author: stsp
Date: Tue Jan 17 13:23:34 2017
New Revision: 1779188
URL: http://svn.apache.org/viewvc?rev=1779188=rev
Log:
Fix a compiler warning about an unused variable:
subversion/mod_authz_svn/mod_authz_svn.c: In function 'get_access_conf
Modified: subversion/trunk/subversion/po/it.po
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/po/it.po?rev=1778776=1778775=1778776=diff
==
--- subversion/trunk/subversion/po/it.po (original)
+++
Author: stsp
Date: Sat Jan 14 14:42:40 2017
New Revision: 1778776
URL: http://svn.apache.org/viewvc?rev=1778776=rev
Log:
* subversion/po/it.po: Italian translation update.
Patch by: Vincenzo Reale
Modified:
subversion/trunk/subversion/po/it.po
Author: stsp
Date: Sat Jan 14 13:47:16 2017
New Revision: 1778771
URL: http://svn.apache.org/viewvc?rev=1778771=rev
Log:
* community-guide/l10n.part.html: Link to the right page for the
'other conventions' section.
Modified:
subversion/site/publish/docs/community-guide/l10n.part.html
Author: stsp
Date: Thu Dec 22 11:23:41 2016
New Revision: 1775630
URL: http://svn.apache.org/viewvc?rev=1775630=rev
Log:
Add another test to tickle the resolver's move detection code some more.
* subversion/tests/libsvn_client/conflicts-test.c
Author: stsp
Revision: 1775611
Modified property: svn:log
Modified: svn:log at Thu Dec 22 10:43:34 2016
--
--- svn:log (original)
+++ svn:log Thu Dec 22 10:43:34 2016
@@ -1,6 +1,6 @@
Add another resolver test
Author: stsp
Date: Thu Dec 22 10:40:14 2016
New Revision: 1775615
URL: http://svn.apache.org/viewvc?rev=1775615=rev
Log:
Improve names of some resolver tests and use seperate test sandboxes.
* subversion/tests/libsvn_client/conflicts-test.c
(run_test_update_incoming_dir_move_with_nested_file
Author: stsp
Date: Thu Dec 22 10:33:39 2016
New Revision: 1775611
URL: http://svn.apache.org/viewvc?rev=1775611=rev
Log:
Add another resolver test.
This new test moves a parent directory and then moves is back again.
* subversion/tests/libsvn_client/conflicts-test.c
Author: stsp
Date: Thu Dec 22 10:25:35 2016
New Revision: 1775609
URL: http://svn.apache.org/viewvc?rev=1775609=rev
Log:
Rename some resolver tests to indicate the node kind being tested with.
* subversion/tests/libsvn_client/conflicts-test.c
(create_wc_with_incoming_delete_merge_conflict
Author: stsp
Date: Thu Dec 22 07:26:45 2016
New Revision: 1775580
URL: http://svn.apache.org/viewvc?rev=1775580=rev
Log:
Add a new conflict resolver test.
This test verifies behaviour when resolving an 'incoming delete' conflict
upon update by accepting the incoming deletion.
* subversion/tests
Author: stsp
Date: Thu Dec 22 07:21:13 2016
New Revision: 1775579
URL: http://svn.apache.org/viewvc?rev=1775579=rev
Log:
Add a new conflict resolver test.
This test verifies behaviour when resolving an 'incoming delete' conflict
upon update by ignoring the incoming deletion.
* subversion/tests
Author: stsp
Date: Thu Dec 22 06:49:50 2016
New Revision: 1775577
URL: http://svn.apache.org/viewvc?rev=1775577=rev
Log:
Add a new conflict resolver test.
This test verifies behaviour when resolving an 'add dir vs add dir' conflict
upon update by ignoring the incoming directory (effectively
Author: stsp
Date: Thu Dec 22 06:10:07 2016
New Revision: 1775575
URL: http://svn.apache.org/viewvc?rev=1775575=rev
Log:
* libsvn_client/conflicts-test.c
(create_wc_with_file_add_vs_file_add_update_conflict): Fix a comment.
Modified:
subversion/trunk/subversion/tests/libsvn_client
Author: stsp
Date: Wed Dec 21 18:07:45 2016
New Revision: 1775521
URL: http://svn.apache.org/viewvc?rev=1775521=rev
Log:
Make the conflict resolver cope with moved parent directories.
Resolves an XFAIL test.
The main fix is that we stop assuming moves in our repository move table
apply
Author: stsp
Date: Wed Dec 21 12:36:27 2016
New Revision: 1775407
URL: http://svn.apache.org/viewvc?rev=1775407=rev
Log:
* subversion/libsvn_client/conflicts.c
(find_nested_moves): Add all ambiguous nested moves to the list of moves in
a revision, instead of adding just the first ambiguous
801 - 900 of 4926 matches
Mail list logo
