On 7/10/19 2:46 PM, Josef Reidinger wrote:
V Wed, 10 Jul 2019 12:13:52 +0100 José Iván López González <jlopez@suse.de> napsáno:
Hi guys,
I see we have several temporary branches in many YaST repos, for example in yast-storage-ng:
SLE-12-SP2 tracked SLE-12-SP3 tracked SLE-15-GA tracked SLE-15-SP1 tracked feature/bsc-1123688 tracked feature/export-stray-blk-devices tracked feature/suma tracked master tracked missing-textdomain tracked parallel_rubocop_at_travis tracked pre-SLE-15-SP2 tracked rtl-pathnames tracked sle15_parallel_tests tracked stray_blk_dev_impl tracked suma_guided_setup tracked suma_proposal_devices tracked upstream/feature/partitioner-remember-tree-state tracked
In this particular repo I would only expect to have: SLE-12-SP2, SLE-12-SP3, SLE-15-GA, SLE-15-SP1 and master.
For other repos is even worst, for example yast-yast2:
SLE-12-SP2 tracked SLE-12-SP3 tracked SLE-12-SP4 tracked SLE-15-GA tracked SLE-15-GA-1113732 tracked SLE-15-GA-registration-popup tracked SLE-15-SP1 tracked add_hostname tracked better_socket_support tracked bsc_1098919 tracked commandline-crash tracked drop_perl tracked drop_susefirewall_code tracked expanded_ids tracked fw-interfaces-read tracked ifconfig_parser tracked kill_logging_builtins tracked list_all_cards_in_fw tracked master tracked merge_SLE-12-SP3 tracked merge_SLE-12-SP4 tracked new_rubocop tracked no-xversion tracked openSUSE-10_0 tracked openSUSE-10_1 tracked openSUSE-10_2 tracked openSUSE-10_3 tracked openSUSE-11_0 tracked openSUSE-11_2 tracked openSUSE-11_3 tracked openSUSE-11_4 tracked openSUSE-12_1 tracked openSUSE-12_2 tracked openSUSE-12_3 tracked openSUSE-13_1 tracked openSUSE-13_2 tracked openSUSE-9_3 tracked readline tracked review_180109_double_entries tracked review_180125_checking_package_installed tracked review_180130_xvnc_socket_disabled tracked rubocop-0.59.2 tracked sorbet tracked sw_01 tracked systemd_table tracked unsigned_repo tracked
Having all these temporary branches is not a big problem, but sometimes it is quite annoying when you run a "git fetch". What do you think about doing some cleanup in all YaST repos?
cleanup is fine for me. Automatic even nicer, just please ensure that it:
1. keep product branches. Maybe for no longer deleveloped version we can use tag instead of version, but who knows when so critical security bug appear, that we will need to release update even for no longer officially maintained product.
2. keep branch with changes against master. This should allow to keep various WIP branches or POC branches, that can be useful in future ( probably not, but who knows ).
Yes, I agree. We have to do it carefully (as Imo also mentioned in another reply). Maybe we can bring the discussion up during our next retro. Should we create temporary branches in upstream repos? Should we always remove them after merging? Or should we always use forks? I don't have a strong opinion about the branches for POC, but for daily work I would prefer to use forks and keep upstream as clean as possible.
Josef
I could extend my HW project [1] (still a WIP) to do it. It should be quite easy to add a new script to clean the repos. The good thing is that it is not necessary to locally clone the repos. With [1] we have the base to do it directly to GitHub thanks to Octokit [2].
CU, Iván
-- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org