Author: dsahlberg
Date: Sat Mar 1 23:16:17 2025
New Revision: 1924127
URL: http://svn.apache.org/viewvc?rev=1924127&view=rev
Log:
Followup to r1924124 and r1924122
Merge r1924125 from trunk, switching to a proper SVN WC
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/.github/workflows/detect-backport-conflicts.yml
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1924125
Modified:
subversion/branches/1.14.x/.github/workflows/detect-backport-conflicts.yml
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/.github/workflows/detect-backport-conflicts.yml?rev=1924127&r1=1924126&r2=1924127&view=diff
==============================================================================
--- subversion/branches/1.14.x/.github/workflows/detect-backport-conflicts.yml
(original)
+++ subversion/branches/1.14.x/.github/workflows/detect-backport-conflicts.yml
Sat Mar 1 23:16:17 2025
@@ -43,13 +43,9 @@ jobs:
sudo apt-get install
subversion
- - name: Use LF for Git checkout
- run: |
- git config --global core.autocrlf false
- git config --global core.eol lf
-
- - uses: actions/checkout@v4
+ - name: Checkout backport branch
+ run: svn co https://svn.apache.org/repos/asf/subversion/branches/1.14.x
- name: Detect conflicting backports
- run: ./tools/dist/detect-conflicting-backports.py
+ run: cd 1.14.x && ./tools/dist/detect-conflicting-backports.py
