[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#71408] Request for merging "python-team" branch
From: |
jgart |
Subject: |
[bug#71408] Request for merging "python-team" branch |
Date: |
Tue, 25 Jun 2024 17:04:03 +0000 |
> This aligns with the current (and previous) guidance on managing
>
> branches [1]. Providing there's a consistent topic for the branch, any
>
> name is fine (e.g. python-team-sphinx is fine).
Hi Christopher,
That's great that my proposal already aligns with the current guidance.
I am going to try to start cherry picking uncontroversial and non failing
patches on the python-team branch on to master and removing them from the
python-team branch in order to reduce the size of the branch. I can then remove
those commits from the python-team branch and force push to update it. What do
you think of this approach before I attempt it? I'll wait on your guidance
before doing this.
Another approach I can take is to break the branch apart into 2 or 3 smaller
topic branches and make requests for those branches to merge one at a time.
Note that I have an underpowered old Thinkpad X230 laptop and will only be able
to test branches that are not too large. I tried using QA/CI but it seemed to
be in an unknown state the last time that I tried. Any suggestions here for how
to more effectively use that QA/CI infrastructure would be much appreciated.
I tried spending a bit of time on trying to resolve the merge conflicts but it
quickly lead down a long rabbit hole and I only have a limited time to fix so
many merge conflicts. The process is also currently very tedious to do with
high amounts of accuracy due to their being
1. Lots of commits that I am not familiar
2. Lots of commits
3. The branch has diverged alot since latest master so things don't cleanly
apply anymore
What do you think of this current approach of cherry picking good commits off
of the python-team branch in order to reduce the size?
Another issue that I ran into on the branch is that there are commits that are
failing. For example, at commit fdef5662cce6a57aa6bfa682c7260b65ce3669b8 (the
borgmatic changes), borgmatic fails. Should I remove this commit since it is
broken?
all the best,
jgart