From 08720467569df77d6b323c21e1916cd870ce235a Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 6 Jan 2025 04:14:45 +0300 Subject: [PATCH] Merge and add branches for adruino (from reports) Given that arduino (1.x) and arduino-ide (2.x) are heavily intermixed in repositories, and 1.x is officially legacy, merge these despite that these are not related codewise, and add branches for proper legacy version handling. --- 800.renames-and-merges/a.yaml | 1 + 950.split-branches.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/800.renames-and-merges/a.yaml b/800.renames-and-merges/a.yaml index 565a5a162..b284860d5 100644 --- a/800.renames-and-merges/a.yaml +++ b/800.renames-and-merges/a.yaml @@ -280,6 +280,7 @@ - { setname: archiva, name: apache-archiva } - { setname: ardour, namepat: "ardour[0-9]+" } - { setname: arduino, namepat: "arduino[0-9.-]+" } +- { setname: arduino, name: arduino-ide } - { setname: areca, name: areca-beta, weak_devel: true, nolegacy: true } - { setname: areca-backup, name: arecabackup } - { setname: arena-chess, name: arena-chess-gui } diff --git a/950.split-branches.yaml b/950.split-branches.yaml index 512bfa361..cc4e70130 100644 --- a/950.split-branches.yaml +++ b/950.split-branches.yaml @@ -11,6 +11,8 @@ - { name: apr, setbranchcomps: 1 } - { name: apr-util, setbranchcomps: 1 } +- { name: arduino, setbranchcomps: 1 } + - { name: asterisk, setbranchcomps: 1 } - { name: autoconf, releq: "2.13", setbranch: "2.13" }