Author: stsp
Date: Sun Nov 18 13:52:42 2018
New Revision: 1846845
URL: http://svn.apache.org/viewvc?rev=1846845=rev
Log:
* STATUS: Update r1846299 nomination: a backport branch now exists.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http
Author: stsp
Date: Sun Nov 18 13:50:32 2018
New Revision: 1846844
URL: http://svn.apache.org/viewvc?rev=1846844=rev
Log:
1.10.x backport of r1846299
Added:
subversion/branches/1.10.x-r1846299/ (props changed)
- copied from r1846843, subversion/branches/1.10.x/
Modified
Author: stsp
Date: Sun Nov 18 09:28:32 2018
New Revision: 1846822
URL: http://svn.apache.org/viewvc?rev=1846822=rev
Log:
* STATUS: Nominate r1846299.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Sun Nov 18 09:24:17 2018
New Revision: 1846821
URL: http://svn.apache.org/viewvc?rev=1846821=rev
Log:
* STATUS: Nominate r1846299.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Sun Nov 18 09:16:56 2018
New Revision: 1846820
URL: http://svn.apache.org/viewvc?rev=1846820=rev
Log:
* STATUS: Nominate r1846704.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Mon Nov 12 10:23:07 2018
New Revision: 1846391
URL: http://svn.apache.org/viewvc?rev=1846391=rev
Log:
Create the dav-path-escape branch. See BRANCH-README for details.
Patch by: philip
Added:
subversion/branches/dav-path-escape/ (props changed)
- copied from
Author: stsp
Date: Sat Nov 10 12:03:12 2018
New Revision: 1846301
URL: http://svn.apache.org/viewvc?rev=1846301=rev
Log:
* site/publish: Merge from staging.
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/release-notes/1.11.html
Propchange: subversion
Author: stsp
Date: Sat Nov 10 12:02:17 2018
New Revision: 1846300
URL: http://svn.apache.org/viewvc?rev=1846300=rev
Log:
* sites/staging/docs/release-notes/1.11.html
(github-issue): Document compatibility problems between Github and SVN 1.11.
Modified:
subversion/site/staging/docs/release
Author: stsp
Date: Sat Nov 10 11:31:41 2018
New Revision: 1846299
URL: http://svn.apache.org/viewvc?rev=1846299=rev
Log:
Add resolver support for unversioned directories during update/switch.
The resolver now offers the 'merge directories' option when it encounters
a conflict for an incoming
Author: stsp
Date: Fri Nov 2 11:52:33 2018
New Revision: 1845579
URL: http://svn.apache.org/viewvc?rev=1845579=rev
Log:
* STATUS: Nominate r1845577.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Fri Nov 2 11:51:29 2018
New Revision: 1845578
URL: http://svn.apache.org/viewvc?rev=1845578=rev
Log:
* STATUS: Nominate r1845577.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Fri Nov 2 11:42:35 2018
New Revision: 1845577
URL: http://svn.apache.org/viewvc?rev=1845577=rev
Log:
Add resolver support for 'added file vs unversioned file' with update/switch.
Make the conflict resolver handle conflicts recorded during update and switch
operations where
Author: stsp
Date: Fri Nov 2 09:31:50 2018
New Revision: 1845557
URL: http://svn.apache.org/viewvc?rev=1845557=rev
Log:
Skip interactive conflict resolution after a dry-run merge.
The resolver will find that it has nothing to do in dry-run mode because
no new conflicts were recorded. So running
Author: stsp
Date: Mon Oct 29 16:29:45 2018
New Revision: 30499
Log:
Add my signatures for Subversion 1.11.0.
Modified:
dev/subversion/subversion-1.11.0.tar.bz2.asc
dev/subversion/subversion-1.11.0.tar.gz.asc
Modified: dev/subversion/subversion-1.11.0.tar.bz2.asc
Author: stsp
Date: Fri Oct 26 11:50:38 2018
New Revision: 1844898
URL: http://svn.apache.org/viewvc?rev=1844898=rev
Log:
* STATUS: Vote for issue #4768 fix.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Fri Oct 26 11:46:35 2018
New Revision: 1844896
URL: http://svn.apache.org/viewvc?rev=1844896=rev
Log:
* STATUS: Vote for r1842814 group.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Fri Oct 26 10:19:32 2018
New Revision: 1844888
URL: http://svn.apache.org/viewvc?rev=1844888=rev
Log:
* STATUS: Nominate r1844882.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Fri Oct 26 10:18:39 2018
New Revision: 1844887
URL: http://svn.apache.org/viewvc?rev=1844887=rev
Log:
* STATUS: Nominate r1844882.
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 Oct 26 10:07:21 2018
New Revision: 1844884
URL: http://svn.apache.org/viewvc?rev=1844884=rev
Log:
* STATUS: Nominate r1844882.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Fri Oct 26 10:01:28 2018
New Revision: 1844882
URL: http://svn.apache.org/viewvc?rev=1844882=rev
Log:
Propagate the SVNUseUTF8 option in mod_dav_svn's merge_server_config callback.
Fixes a problem where the SVNUseUTF8 option had no effect in some cases.
* subversion
Author: stsp
Date: Tue Oct 16 09:47:23 2018
New Revision: 1843988
URL: http://svn.apache.org/viewvc?rev=1843988=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update ruby to 2.4.4; I am secretly
hoping that this will fix ruby SIGBUS problems on the openbsd buildbot.
Modified:
subversion
Author: stsp
Date: Sat Oct 6 10:44:46 2018
New Revision: 29913
Log:
Add my signatures for 1.10.3.
Modified:
dev/subversion/subversion-1.10.3.tar.bz2.asc
dev/subversion/subversion-1.10.3.tar.gz.asc
Modified: dev/subversion/subversion-1.10.3.tar.bz2.asc
Author: stsp
Date: Mon Oct 1 15:46:49 2018
New Revision: 1842513
URL: http://svn.apache.org/viewvc?rev=1842513=rev
Log:
Website: sync merge from 'staging' to 'publish'.
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/release-notes/1.11.html
Author: stsp
Date: Mon Oct 1 15:45:24 2018
New Revision: 1842512
URL: http://svn.apache.org/viewvc?rev=1842512=rev
Log:
* staging/docs/release-notes/1.11.html: Conflict resolver improvements.
Modified:
subversion/site/staging/docs/release-notes/1.11.html
Modified: subversion/site/staging
Author: stsp
Date: Mon Oct 1 10:00:49 2018
New Revision: 1842448
URL: http://svn.apache.org/viewvc?rev=1842448=rev
Log:
* STATUS: Fix a typo.
Noticed by: brane
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: stsp
Date: Mon Oct 1 09:29:42 2018
New Revision: 1842444
URL: http://svn.apache.org/viewvc?rev=1842444=rev
Log:
* STATUS: Vote for r1842334.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Mon Oct 1 09:09:25 2018
New Revision: 1842440
URL: http://svn.apache.org/viewvc?rev=1842440=rev
Log:
* STATUS: Add link to users@ thread which looks like another instance
of the bug fixed by r1839662.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion
Author: stsp
Date: Mon Oct 1 09:03:14 2018
New Revision: 1842439
URL: http://svn.apache.org/viewvc?rev=1842439=rev
Log:
* STATUS: Vote for the 1.10.x-issue4758 branch, approving.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http
Author: stsp
Date: Mon Oct 1 09:00:46 2018
New Revision: 1842438
URL: http://svn.apache.org/viewvc?rev=1842438=rev
Log:
* STATUS: Vote for r1836762 group, approving.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: stsp
Date: Sat Sep 29 07:25:34 2018
New Revision: 29777
Log:
add my signatures for 1.11.0-rc2
Modified:
dev/subversion/subversion-1.11.0-rc2.tar.bz2.asc
dev/subversion/subversion-1.11.0-rc2.tar.gz.asc
Modified: dev/subversion/subversion-1.11.0-rc2.tar.bz2.asc
Author: stsp
Date: Fri Sep 28 10:31:25 2018
New Revision: 1842230
URL: http://svn.apache.org/viewvc?rev=1842230=rev
Log:
* STATUS: Vote for ruby bindings fix.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: stsp
Date: Fri Sep 28 10:27:29 2018
New Revision: 1842229
URL: http://svn.apache.org/viewvc?rev=1842229=rev
Log:
* tools/dev/unix/build/Makefile.svn: Honour override of CC for GNU iconv, too.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk
Author: stsp
Date: Tue Sep 25 17:35:22 2018
New Revision: 1841965
URL: http://svn.apache.org/viewvc?rev=1841965=rev
Log:
* subversion/libsvn_subr/config_file.c
(svn_config_ensure): Add 'http-auth-types' to list of supported options in
the 'servers' file template.
Modified:
subversion
Author: stsp
Date: Mon Sep 24 05:50:57 2018
New Revision: 1841796
URL: http://svn.apache.org/viewvc?rev=1841796=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
Author: stsp
Date: Sun Sep 23 13:40:27 2018
New Revision: 1841755
URL: http://svn.apache.org/viewvc?rev=1841755=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
Author: stsp
Date: Sun Sep 23 13:36:47 2018
New Revision: 1841754
URL: http://svn.apache.org/viewvc?rev=1841754=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
where
Author: stsp
Date: Sun Sep 23 11:36:04 2018
New Revision: 1841748
URL: http://svn.apache.org/viewvc?rev=1841748=rev
Log:
Merge outstanding changes from staging to publish; these have been
sitting here for long enough
Modified:
subversion/site/publish/ (props changed)
subversion/site
Author: stsp
Date: Sun Sep 23 11:14:07 2018
New Revision: 1841745
URL: http://svn.apache.org/viewvc?rev=1841745=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
Author: stsp
Date: Sun Sep 23 11:09:20 2018
New Revision: 1841744
URL: http://svn.apache.org/viewvc?rev=1841744=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/viewvc
Author: stsp
Date: Sun Sep 23 11:08:18 2018
New Revision: 1841743
URL: http://svn.apache.org/viewvc?rev=1841743=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
Author: stsp
Date: Sun Sep 23 11:05:43 2018
New Revision: 1841742
URL: http://svn.apache.org/viewvc?rev=1841742=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-code
Author: stsp
Date: Sun Sep 23 10:15:07 2018
New Revision: 1841737
URL: http://svn.apache.org/viewvc?rev=1841737=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/viewvc
Author: stsp
Date: Sun Sep 23 09:58:59 2018
New Revision: 1841736
URL: http://svn.apache.org/viewvc?rev=1841736=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
Author: stsp
Date: Sun Sep 23 09:55:03 2018
New Revision: 1841735
URL: http://svn.apache.org/viewvc?rev=1841735=rev
Log:
Merge r1841180, r1841524, and r1841525 from trunk.
* r1841180, r1841524, r1841525
Merge the 'java10-compat' branch to trunk
Justification:
Enables building against
Author: stsp
Date: Sun Sep 23 09:53:55 2018
New Revision: 1841734
URL: http://svn.apache.org/viewvc?rev=1841734=rev
Log:
Merge r1841059, r1841600, r1841601, r1841602, and r1841606 from trunk.
* r1841059,r1841600,r1841601,r1841602,r1841606
Change the shelf storage dir from ".svn/sh
Author: stsp
Date: Sun Sep 23 09:48:18 2018
New Revision: 1841733
URL: http://svn.apache.org/viewvc?rev=1841733=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
Author: stsp
Date: Sun Sep 23 09:43:41 2018
New Revision: 1841732
URL: http://svn.apache.org/viewvc?rev=1841732=rev
Log:
Merge r1840990, r1840991, r1840995, and r1840997 from trunk.
* r1840990, r1840991, r1840995, r1840997
Various conflict resolver improvements.
Notes:
I am proposing
Author: stsp
Date: Sun Sep 23 09:40:44 2018
New Revision: 1841731
URL: http://svn.apache.org/viewvc?rev=1841731=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' retry
Author: stsp
Date: Sun Sep 23 09:01:14 2018
New Revision: 1841725
URL: http://svn.apache.org/viewvc?rev=1841725=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
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
Author: stsp
Date: Sun Sep 23 08:05:24 2018
New Revision: 1841719
URL: http://svn.apache.org/viewvc?rev=1841719=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
Author: stsp
Date: Sun Sep 23 07:02:38 2018
New Revision: 1841718
URL: http://svn.apache.org/viewvc?rev=1841718=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
Modified: subversion/trunk/subversion/po/sv.po
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/po/sv.po?rev=1841717=1841716=1841717=diff
==
--- subversion/trunk/subversion/po/sv.po [UTF-8] (original)
+++
Author: stsp
Date: Sun Sep 23 07:00:49 2018
New Revision: 1841717
URL: http://svn.apache.org/viewvc?rev=1841717=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
Author: stsp
Date: Sun Sep 23 06:58:34 2018
New Revision: 1841716
URL: http://svn.apache.org/viewvc?rev=1841716=rev
Log:
Prevent duplicate message ID entries in translation files.
Fixes a build problem for me where msgfmt errors out with:
subversion/po/sv.po:13836: duplicate message definition
Author: stsp
Date: Sun Sep 16 12:57:19 2018
New Revision: 1840999
URL: http://svn.apache.org/viewvc?rev=1840999=rev
Log:
* STATUS: Nominate r1840990, r1840991, r1840995, r1840997 for 1.11.0.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http
Author: stsp
Date: Sun Sep 16 12:50:34 2018
New Revision: 1840997
URL: http://svn.apache.org/viewvc?rev=1840997=rev
Log:
Improve the semantics of four public API resolver functions.
In all cases, the old APIs would raise an assertion failure if an unexpected
option was passed. This is bad API
Author: stsp
Date: Sun Sep 16 10:43:17 2018
New Revision: 1840995
URL: http://svn.apache.org/viewvc?rev=1840995=rev
Log:
Implement support for ambiguous moves for 'local missing' conflicts.
* subversion/libsvn_client/conflicts.c
(conflict_tree_local_missing_details): Replace the single
Author: stsp
Date: Sun Sep 16 09:12:59 2018
New Revision: 1840992
URL: http://svn.apache.org/viewvc?rev=1840992=rev
Log:
* STATUS: Nominate r1840991
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches
Author: stsp
Date: Sun Sep 16 09:10:58 2018
New Revision: 1840991
URL: http://svn.apache.org/viewvc?rev=1840991=rev
Log:
Prevent an out-of-bounds array access in the conflict resolver.
* subversion/libsvn_client/conflicts.c
(svn_client_conflict_option_set_moved_to_repos_relpath): Reset our
Author: stsp
Date: Sun Sep 16 08:57:23 2018
New Revision: 1840990
URL: http://svn.apache.org/viewvc?rev=1840990=rev
Log:
* subversion/libsvn_client/conflicts.c
(svn_client_conflict_text_get_resolution_options): Use more precise wording
in option descriptions.
Modified:
subversion/trunk
Author: stsp
Date: Thu Sep 6 13:36:41 2018
New Revision: 1840223
URL: http://svn.apache.org/viewvc?rev=1840223=rev
Log:
* subversion/svn/svn.c
(svn_cl__cmd_table): Add an example to 'svn help log' showing how to list
all commits which happned between two tags.
* subversion/tests/cmdline
Author: stsp
Date: Mon Sep 3 12:49:22 2018
New Revision: 1839954
URL: http://svn.apache.org/viewvc?rev=1839954=rev
Log:
* tools/dev/unix-build/Makefile.svn: bzip.org seems to be down and
distfiles can no longer be downloaded there; switch URL to a mirror
Modified:
subversion/trunk/tools
Author: stsp
Date: Thu Aug 30 12:30:51 2018
New Revision: 1839674
URL: http://svn.apache.org/viewvc?rev=1839674=rev
Log:
STATUS: typo fix
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x
Author: stsp
Date: Thu Aug 30 12:30:27 2018
New Revision: 1839673
URL: http://svn.apache.org/viewvc?rev=1839673=rev
Log:
* STATUS: Nominate r1839662.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Revision: 1839662
Modified property: svn:log
Modified: svn:log at Thu Aug 30 12:25:52 2018
--
--- svn:log (original)
+++ svn:log Thu Aug 30 12:25:52 2018
@@ -5,6 +5,7 @@ a 'incoming edit vs. local missing
Author: stsp
Date: Thu Aug 30 11:39:40 2018
New Revision: 1839662
URL: http://svn.apache.org/viewvc?rev=1839662=rev
Log:
Don't scan for moves for 'local missing' conflicts unless a YCA is known.
Prevent the resolver from embarking on an endless search in case of
a 'incoming edit vs. local
Author: stsp
Date: Mon Aug 27 15:28:01 2018
New Revision: 1839344
URL: http://svn.apache.org/viewvc?rev=1839344=rev
Log:
Follow-up to r1839342:
Make test_merge_incoming_edit_file_moved_away pass again after r1839342.
I should have committed both changes in the same revision.
* subversion
Author: stsp
Date: Mon Aug 27 15:21:28 2018
New Revision: 1839342
URL: http://svn.apache.org/viewvc?rev=1839342=rev
Log:
Extend an existing conflict resolver test.
* subversion/trunk/tests/libsvn_client/conflicts-test.c
(test_merge_incoming_edit_file_moved_away): Verify the result
Author: stsp
Date: Mon Aug 27 10:32:19 2018
New Revision: 1839292
URL: http://svn.apache.org/viewvc?rev=1839292=rev
Log:
Introduce separate conflict option IDs for sibling move cases.
New option IDs had been avoided to make backporting to 1.10 easier.
Since the outstanding backport proposal
Author: stsp
Date: Mon Aug 27 09:57:45 2018
New Revision: 1839290
URL: http://svn.apache.org/viewvc?rev=1839290=rev
Log:
* tools/dev/unix/build/Makefile.svn: Use the correct compiler on OpenBSD.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools
Author: stsp
Date: Mon Aug 27 08:56:09 2018
New Revision: 1839283
URL: http://svn.apache.org/viewvc?rev=1839283=rev
Log:
Retract issue #4694 fix nomination for 1.10.
The proposed change is large and yet incomplete. Given that 1.11 isn't
too far off due to our new 6-months release cycle, it makes
Author: stsp
Date: Fri Aug 10 16:34:34 2018
New Revision: 1837825
URL: http://svn.apache.org/viewvc?rev=1837825=rev
Log:
For issue #4694, handle cherry-picking across moved directories.
Also, refactor conflict option configuration a bit to clearly
separate local-move options from sibling-move
Author: stsp
Date: Fri Aug 10 16:10:09 2018
New Revision: 1837821
URL: http://svn.apache.org/viewvc?rev=1837821=rev
Log:
Fix expectations of an XFAIL conflict resolver test.
* subversion/test/libsvn_client/conflicts-test.c
(test_cherry_pick_post_move_edit_dir): Fix errors in paths used
Author: stsp
Date: Fri Aug 10 12:15:38 2018
New Revision: 1837795
URL: http://svn.apache.org/viewvc?rev=1837795=rev
Log:
* STATUS: Propose partial issue #4694 fix.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: stsp
Date: Fri Aug 10 10:49:24 2018
New Revision: 1837792
URL: http://svn.apache.org/viewvc?rev=1837792=rev
Log:
* STATUS: Propose r1837790.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches
Author: stsp
Date: Fri Aug 10 10:47:04 2018
New Revision: 1837790
URL: http://svn.apache.org/viewvc?rev=1837790=rev
Log:
Make 'svnadmin verify --keep-going' always show an error summary.
Previously, the error summary was not displayed if the --quiet option
was used in combination with --keep
Author: stsp
Date: Sun Jul 29 14:11:03 2018
New Revision: 1836978
URL: http://svn.apache.org/viewvc?rev=1836978=rev
Log:
* STATUS: Nominate r1836976.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Revision: 1836976
Modified property: svn:log
Modified: svn:log at Sun Jul 29 13:50:55 2018
--
--- svn:log (original)
+++ svn:log Sun Jul 29 13:50:55 2018
@@ -1,5 +1,7 @@
Fix relpath_is_canonical() assertion
Author: stsp
Date: Sun Jul 29 13:46:54 2018
New Revision: 1836977
URL: http://svn.apache.org/viewvc?rev=1836977=rev
Log:
Add an XFAIL resolver test for cherry-picking directory edits.
Add an XFAIL test which attempts to cherry-pick across a moved directory.
Incidentally, this test also covers
Author: stsp
Date: Sun Jul 29 13:28:08 2018
New Revision: 1836976
URL: http://svn.apache.org/viewvc?rev=1836976=rev
Log:
Fix relpath_is_canonical() assertion failure in the conflict resolver.
* subversion/libsvn_client/conflicts.c
(find_modified_rev): Make sure to canonicalize copyfrom path
Author: stsp
Date: Sun Jul 29 13:13:49 2018
New Revision: 1836975
URL: http://svn.apache.org/viewvc?rev=1836975=rev
Log:
Follow-up to r1836972: Fix accidental test fallout.
* subversion/tests/cmdline/tree_conflict_tests.py
(ensure_tree_conflict): Pass --accept=postpone to 'svn merge
Author: stsp
Date: Sun Jul 29 12:48:44 2018
New Revision: 1836972
URL: http://svn.apache.org/viewvc?rev=1836972=rev
Log:
Revert r1783879. Again recommend the "move + merge" option during merges.
The "apply edits to old location" resolver option mentioned in the log
message
Author: stsp
Date: Sun Jul 29 12:36:31 2018
New Revision: 1836971
URL: http://svn.apache.org/viewvc?rev=1836971=rev
Log:
* STATUS: Propose issue #4766 fix.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Sun Jul 29 12:29:51 2018
New Revision: 1836970
URL: http://svn.apache.org/viewvc?rev=1836970=rev
Log:
* STATUS: Nominate r1836963.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Sun Jul 29 12:25:30 2018
New Revision: 1836969
URL: http://svn.apache.org/viewvc?rev=1836969=rev
Log:
Merge r1833895, r1833897, r1833899, and r1833901 from trunk:
* r1833895, r1833897, r1833899, r1833901
Fix issue #4744 "during merge: assertion failed (start_rev >
Author: stsp
Date: Sun Jul 29 12:22:24 2018
New Revision: 1836968
URL: http://svn.apache.org/viewvc?rev=1836968=rev
Log:
Fix issue #4766, "resolver adds unrelated moves to move target list"
* subversion/libsvn_client/conflicts.c
(find_operative_moves): Fix the logic which detects
Author: stsp
Date: Sun Jul 29 11:24:48 2018
New Revision: 1836963
URL: http://svn.apache.org/viewvc?rev=1836963=rev
Log:
Fix a potential NULL dereference in the conflict resolver.
* subversion/libsvn_client/conflicts.c
(map_deleted_path_to_move): Check the result of svn_relpath_skip_ancestor
Author: stsp
Revision: 1836960
Modified property: svn:log
Modified: svn:log at Sun Jul 29 10:27:52 2018
--
--- svn:log (original)
+++ svn:log Sun Jul 29 10:27:52 2018
@@ -1,4 +1,4 @@
-add an XTAIL test for issue #4766
Author: stsp
Date: Sun Jul 29 10:27:12 2018
New Revision: 1836960
URL: http://svn.apache.org/viewvc?rev=1836960=rev
Log:
add an XTAIL test for issue #4766 (resolver adds unrelated moves)
* subversion/libsvn_client/conflicts-test.c
(new_file2_name): New constant
Author: stsp
Date: Sat Jul 21 14:44:01 2018
New Revision: 1836410
URL: http://svn.apache.org/viewvc?rev=1836410=rev
Log:
Follow-up to r1836409: Fix test fallout.
* subversion/tests/libsvn_wc/wc-queries-test.c
(slow_statements): Add the new query added in r1836409.
Modified:
subversion
Author: stsp
Date: Sat Jul 21 14:10:16 2018
New Revision: 1836409
URL: http://svn.apache.org/viewvc?rev=1836409=rev
Log:
Fix issue #4694 "cherry-pick edit after file was moved on source branch"
Add conflict resolver support for cherry-picking changes from files which
have been moved on
Author: stsp
Date: Sat Jul 21 13:22:05 2018
New Revision: 1836406
URL: http://svn.apache.org/viewvc?rev=1836406=rev
Log:
Fix wrong expectations of an XFAIL conflict resolver test.
* subversion/tests/libsvn_client/conflict-tests.c
(test_cherry_pick_post_move_edit): The cherry-pick merge as run
Author: stsp
Date: Wed Jun 20 13:38:21 2018
New Revision: 1833914
URL: http://svn.apache.org/viewvc?rev=1833914=rev
Log:
Rename svn_wc__find_repos_node_in_wc() to svn_wc__db_find_repos_node_in_wc().
This namespace is more appropriate for wc_db code, and we might eventually
want to expose
Author: stsp
Date: Wed Jun 20 09:58:40 2018
New Revision: 1833903
URL: http://svn.apache.org/viewvc?rev=1833903=rev
Log:
* STATUS: Nominate issue #4744 fix.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Wed Jun 20 09:46:05 2018
New Revision: 1833901
URL: http://svn.apache.org/viewvc?rev=1833901=rev
Log:
Fix issue #4744, "assertion failed (start_rev > end_rev)".
Do not attempt to fetch conflict details in the conflict scenario described
in issue #4744, whe
Author: stsp
Date: Wed Jun 20 09:26:20 2018
New Revision: 1833899
URL: http://svn.apache.org/viewvc?rev=1833899=rev
Log:
Follow-up to r1833897:
* subversion/tests/libsvn_client/conflicts-test.c
(create_wc_with_dir_add_vs_dir_add_merge_conflict): Update test
expections here as well
Author: stsp
Date: Wed Jun 20 09:04:51 2018
New Revision: 1833897
URL: http://svn.apache.org/viewvc?rev=1833897=rev
Log:
In case of a merge operation, the 'merge added directories' resolution
option requires tree conflict details. Do not offer this option unless
details have been fetched
Author: stsp
Date: Wed Jun 20 08:37:38 2018
New Revision: 1833895
URL: http://svn.apache.org/viewvc?rev=1833895=rev
Log:
Add a test for issue #4744, "assertion failed (start_rev > end_rev)"
* subversion/tests/libsvn_client/conflicts-test.c
(create_wc_with_added_dir_conflict_ac
Author: stsp
Date: Tue Jun 19 18:15:36 2018
New Revision: 1833868
URL: http://svn.apache.org/viewvc?rev=1833868=rev
Log:
* STATUS: Vote for r1833621.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
401 - 500 of 4926 matches
Mail list logo
