Author: hartmannathan Date: Wed Feb 21 15:14:45 2024 New Revision: 1915925 URL: http://svn.apache.org/viewvc?rev=1915925&view=rev Log: On move-tracking-3 branch, block (record-only) merge of r1915903 from trunk
This branch (move-tracking-3) exists to keep, for historical reference, a prototype/experiment of move-tracking and branching. This branch was formed from trunk at r1915902 and then the work being preserved here was removed from trunk in r1915903. Per the BRANCH-README, the merge policy is "Development branch -- periodic catch-up merges from trunk." Unfortunately, the first thing such a catch-up merge would do is to merge r1915903, which would delete what we're trying to preserve. To avoid that, blocking that revision by a record-only merge, updating mergeinfo. See the dev@ email thread "Removing the old move-tracking experiment" started on 2024 Feb 19, archived here (and elsewhere): https://lists.apache.org/thread/wzv8k2y5jk5c8vwhhns4d8t6on7ld317 * ., notes/move-tracking/README, subversion/libsvn_fs_x, subversion/libsvn_subr/utf8proc, tools/buildbot/slaves/win32-vcpkg (svn:mergeinfo): Record-only merge of r1915903 Modified: subversion/branches/move-tracking-3/ (props changed) subversion/branches/move-tracking-3/notes/move-tracking/README (props changed) subversion/branches/move-tracking-3/subversion/libsvn_fs_x/ (props changed) subversion/branches/move-tracking-3/subversion/libsvn_subr/utf8proc/ (props changed) subversion/branches/move-tracking-3/tools/buildbot/slaves/win32-vcpkg/ (props changed) Propchange: subversion/branches/move-tracking-3/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1915903 Propchange: subversion/branches/move-tracking-3/notes/move-tracking/README ------------------------------------------------------------------------------ Merged /subversion/trunk/notes/move-tracking/README:r1915903 Propchange: subversion/branches/move-tracking-3/subversion/libsvn_fs_x/ ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/libsvn_fs_x:r1915903 Propchange: subversion/branches/move-tracking-3/subversion/libsvn_subr/utf8proc/ ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/libsvn_subr/utf8proc:r1915903 Propchange: subversion/branches/move-tracking-3/tools/buildbot/slaves/win32-vcpkg/ ------------------------------------------------------------------------------ Merged /subversion/trunk/tools/buildbot/slaves/win32-vcpkg:r1915903
