Skip to content

Commit 5688bdc

Browse files
Followup to r1924124 and r1924122
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
1 parent 783450d commit 5688bdc

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

.github/workflows/detect-backport-conflicts.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,9 @@ jobs:
4343
sudo apt-get install
4444
subversion
4545
46-
- name: Use LF for Git checkout
47-
run: |
48-
git config --global core.autocrlf false
49-
git config --global core.eol lf
50-
51-
- uses: actions/checkout@v4
46+
- name: Checkout backport branch
47+
run: svn co https://svn.apache.org/repos/asf/subversion/branches/1.14.x
5248

5349
- name: Detect conflicting backports
54-
run: ./tools/dist/detect-conflicting-backports.py
50+
run: cd 1.14.x && ./tools/dist/detect-conflicting-backports.py
5551

0 commit comments

Comments
 (0)