svn commit: r1841797 - /subversion/branches/1.11.x/STATUS

Author: jcorvel Date: Mon Sep 24 05:54:36 2018 New Revision: 1841797 URL: http://svn.apache.org/viewvc?rev=1841797&view=rev Log: * 1.11.x/STATUS: Vote for the conflict resolver backports. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn

svn commit: r1841796 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Author: stsp Date: Mon Sep 24 05:50:57 2018 New Revision: 1841796 URL: http://svn.apache.org/viewvc?rev=1841796&view=rev Log: Fix wrong paths in comments in resolver tests. Found by: jcorvel * subversion/tests/libsvn_client/conflicts-test.c (test_local_missing_abiguous_moves_dir): Fix up refer

svn commit: r1841773 - /subversion/trunk/subversion/libsvn_wc/README

Author: danielsh Date: Sun Sep 23 18:40:57 2018 New Revision: 1841773 URL: http://svn.apache.org/viewvc?rev=1841773&view=rev Log: * subversion/libsvn_wc/README: Document 1.10's .svn/shelves/ directory. Modified: subversion/trunk/subversion/libsvn_wc/README Modified: subversion/trunk/subversi

svn commit: r1841755 - /subversion/branches/1.11.x/STATUS

Author: stsp Date: Sun Sep 23 13:40:27 2018 New Revision: 1841755 URL: http://svn.apache.org/viewvc?rev=1841755&view=rev Log: * STATUS: Nominate r1841753 and r1841754. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/s

svn commit: r1841754 - in /subversion/trunk/subversion: libsvn_client/conflicts.c tests/libsvn_client/conflicts-test.c

Author: stsp Date: Sun Sep 23 13:36:47 2018 New Revision: 1841754 URL: http://svn.apache.org/viewvc?rev=1841754&view=rev Log: Fix an assertion failure in the conflict resolver. * subversion/libsvn_client/conflicts.c (conflict_tree_get_details_local_missing): We do not yet support the case wh

svn commit: r1841753 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Author: stsp Date: Sun Sep 23 13:09:42 2018 New Revision: 1841753 URL: http://svn.apache.org/viewvc?rev=1841753&view=rev Log: Add an XFAIL resolver test which triggers an assertion failure. This new test triggers an infamous assertion failure which has already been reported several times: svn_t

svn commit: r1841748 - in /subversion/site/publish: ./ docs/ docs/release-notes/release-history.html download.html index.html news.html quick-start.html roadmap.html

Author: stsp Date: Sun Sep 23 11:36:04 2018 New Revision: 1841748 URL: http://svn.apache.org/viewvc?rev=1841748&view=rev Log: Merge outstanding changes from staging to publish; these have been sitting here for long enough Modified: subversion/site/publish/ (props changed) subversion/sit

svn commit: r1841747 - in /subversion/site/staging: ./ docs/community-guide/ docs/release-notes/

Author: stsp Date: Sun Sep 23 11:32:18 2018 New Revision: 1841747 URL: http://svn.apache.org/viewvc?rev=1841747&view=rev Log: sync merge from publish to staging Modified: subversion/site/staging/ (props changed) subversion/site/staging/doap.rdf subversion/site/staging/docs/community

svn commit: r1841745 - /subversion/branches/1.11.x/STATUS

Author: stsp Date: Sun Sep 23 11:14:07 2018 New Revision: 1841745 URL: http://svn.apache.org/viewvc?rev=1841745&view=rev Log: * STATUS: Nominate r1841719 and r1841742. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/s

svn commit: r1841744 - /subversion/branches/1.11.x/STATUS

Author: stsp Date: Sun Sep 23 11:09:20 2018 New Revision: 1841744 URL: http://svn.apache.org/viewvc?rev=1841744&view=rev Log: * STATUS: Add r1841743 to the r1841731 group. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/view

svn commit: r1841743 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

Author: stsp Date: Sun Sep 23 11:08:18 2018 New Revision: 1841743 URL: http://svn.apache.org/viewvc?rev=1841743&view=rev Log: Follow-up to r1841736: * subversion/tests/cmdline/tree_conflict_tests.py (local_missing_dir_endless_loop): Restore trailing newline in file content. Use main.file_app

svn commit: r1841742 - in /subversion/trunk/subversion: libsvn_client/conflicts.c tests/libsvn_client/conflicts-test.c

Author: stsp Date: Sun Sep 23 11:05:43 2018 New Revision: 1841742 URL: http://svn.apache.org/viewvc?rev=1841742&view=rev Log: Add resolver support for 'local missing' conflicts involving directories. * subversion/libsvn_client/conflicts.c (conflict_tree_get_details_local_missing): Don't hard-co

svn commit: r1841737 - /subversion/branches/1.11.x/STATUS

Author: stsp Date: Sun Sep 23 10:15:07 2018 New Revision: 1841737 URL: http://svn.apache.org/viewvc?rev=1841737&view=rev Log: * STATUS: Add r1841736 to r1841731 nomination. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/vie

svn commit: r1841736 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

Author: stsp Date: Sun Sep 23 09:58:59 2018 New Revision: 1841736 URL: http://svn.apache.org/viewvc?rev=1841736&view=rev Log: * subversion/cmdline/tree_conflict_tests.py (local_missing_dir_endless_loop): Remove a trailing newline to hopefully make this test pass on Windows. Modified:

svn commit: r1841735 - in /subversion/branches/1.11.x: ./ build/generator/ build/generator/templates/

Author: stsp Date: Sun Sep 23 09:55:03 2018 New Revision: 1841735 URL: http://svn.apache.org/viewvc?rev=1841735&view=rev Log: Merge r1841180, r1841524, and r1841525 from trunk. * r1841180, r1841524, r1841525 Merge the 'java10-compat' branch to trunk Justification: Enables building aga

svn commit: r1841734 - in /subversion/branches/1.11.x: ./ STATUS subversion/libsvn_wc/README subversion/libsvn_wc/wc.h subversion/libsvn_wc/wcroot_anchor.c

Author: stsp Date: Sun Sep 23 09:53:55 2018 New Revision: 1841734 URL: http://svn.apache.org/viewvc?rev=1841734&view=rev Log: Merge r1841059, r1841600, r1841601, r1841602, and r1841606 from trunk. * r1841059,r1841600,r1841601,r1841602,r1841606 Change the shelf storage dir from ".svn/shelves"

svn commit: r1841733 - /subversion/branches/1.11.x/STATUS

Author: stsp Date: Sun Sep 23 09:48:18 2018 New Revision: 1841733 URL: http://svn.apache.org/viewvc?rev=1841733&view=rev Log: * STATUS: Nominate r1841725 and r1841731. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/s

svn commit: r1841732 - in /subversion/branches/1.11.x: ./ STATUS subversion/include/svn_client.h subversion/libsvn_client/conflicts.c subversion/svn/conflict-callbacks.c subversion/tests/libsvn_client

Author: stsp Date: Sun Sep 23 09:43:41 2018 New Revision: 1841732 URL: http://svn.apache.org/viewvc?rev=1841732&view=rev Log: Merge r1840990, r1840991, r1840995, and r1840997 from trunk. * r1840990, r1840991, r1840995, r1840997 Various conflict resolver improvements. Notes: I am propo

svn commit: r1841731 - in /subversion/trunk/subversion: libsvn_client/conflicts.c tests/cmdline/tree_conflict_tests.py

Author: stsp Date: Sun Sep 23 09:40:44 2018 New Revision: 1841731 URL: http://svn.apache.org/viewvc?rev=1841731&view=rev Log: Fix an endless loop in the interactive conflict resolver. The problem was that the library returned SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, and this error code makes 'svn' r

svn commit: r1841725 - /subversion/trunk/subversion/svn/conflict-callbacks.c

Author: stsp Date: Sun Sep 23 09:01:14 2018 New Revision: 1841725 URL: http://svn.apache.org/viewvc?rev=1841725&view=rev Log: Use an iterpool in the interactive conflict resolver loop. * subversion/svn/conflict-callbacks.c (svn_cl__resolve_conflict): Use an iterpool during interactive loop.

svn propchange: r1841717 - svn:log

Author: stsp Revision: 1841717 Modified property: svn:log Modified: svn:log at Sun Sep 23 08:29:46 2018 -- --- svn:log (original) +++ svn:log Sun Sep 23 08:29:46 2018 @@ -2,4 +2,4 @@ Fix duplicate message IDs in Swedish tr

svn commit: r1841719 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Author: stsp Date: Sun Sep 23 08:05:24 2018 New Revision: 1841719 URL: http://svn.apache.org/viewvc?rev=1841719&view=rev Log: Add a new XFAIL conflict resolver test. This is a basic test for 'local missing' conflicts with directories. It might need to be tweaked further once the resolver starts s

svn commit: r1841718 - /subversion/branches/1.11.x/STATUS

Author: stsp Date: Sun Sep 23 07:02:38 2018 New Revision: 1841718 URL: http://svn.apache.org/viewvc?rev=1841718&view=rev Log: * STATUS: Nominate r1841716 and r1841717. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/s

svn commit: r1841717 [2/2] - /subversion/trunk/subversion/po/sv.po

Modified: subversion/trunk/subversion/po/sv.po URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/sv.po?rev=1841717&r1=1841716&r2=1841717&view=diff == --- subversion/trunk/subversion/po/sv.po [UTF-8] (origi

svn commit: r1841717 [1/2] - /subversion/trunk/subversion/po/sv.po

Author: stsp Date: Sun Sep 23 07:00:49 2018 New Revision: 1841717 URL: http://svn.apache.org/viewvc?rev=1841717&view=rev Log: Fix duplicate message IDs in Swedish translation. See r1841716 for more information. * subversion/po/sv.po: Applied msquniq to avoid duplicate message IDs. Modified: