Skip to content

Commit

Permalink
Followup to r1924124 and r1924122
Browse files Browse the repository at this point in the history
Merge r1924125 from trunk, switching to a proper SVN WC



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.14.x@1924127 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
dsahlberg-apache-org committed Mar 1, 2025
1 parent 783450d commit 5688bdc
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/detect-backport-conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5688bdc

Please sign in to comment.