svn commit: r1888486 - /subversion/branches/1.14.x/STATUS

2021-04-07 Thread danielsh
Author: danielsh Date: Wed Apr 7 20:05:44 2021 New Revision: 1888486 URL: http://svn.apache.org/viewvc?rev=1888486=rev Log: * STATUS: Edit the r1888474 entry. Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL:

svn commit: r1888475 - /subversion/branches/1.14.x/STATUS

2021-04-07 Thread julianfoad
Author: julianfoad Date: Wed Apr 7 13:45:29 2021 New Revision: 1888475 URL: http://svn.apache.org/viewvc?rev=1888475=rev Log: * STATUS: Nominate r1888474 (#4874, foreign repo merge). Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL:

svn commit: r1888474 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py

2021-04-07 Thread julianfoad
Author: julianfoad Date: Wed Apr 7 13:28:00 2021 New Revision: 1888474 URL: http://svn.apache.org/viewvc?rev=1888474=rev Log: Fix issue #4874 "Avoid foreign repository merge if repository UUIDs match" Summary: Repository root URLs must be consistent in a merge. A merge with differing source