juhp
Bug: `fbrnch push -F -r rawhide` does not merge and push
I was expecting fbrnch push to behave like fbrnch parallel where it synchronizes the git branches, at least when you specify -r option, but that doesn't seem to be the case. I guess in the meantime we can chain fbrnch merge with fbrnch push, but that still didn't work for me:
$ fbrnch push -F
Branches: rawhide f41 f40 f39
== rust-tonic-build rawhide ==
Everything up-to-date
== rust-tonic-build f41 ==
28ef33f Update to version 0.12.3 (2024-10-08)
Everything up-to-date
== rust-tonic-build f40 ==
28ef33f Update to version 0.12.3 (2024-10-08)
Everything up-to-date
== rust-tonic-build f39 ==
28ef33f Update to version 0.12.3 (2024-10-08)
Everything up-to-date
$ git log
commit 28ef33ff74d11d8e17c6ced0a9b1232d4e00e582 (HEAD -> rawhide, origin/rawhide, origin/main, origin/HEAD, f41, f40, f39)
Author: Cristian Le <[email protected]>
Date: Tue Oct 8 11:05:02 2024 +0200
Update to version 0.12.3
... (RHBZ#2314946)
Signed-off-by: Cristian Le <[email protected]>
commit e9f208647c1f50d423bcb01245fa486cd070174d (origin/f41, origin/f40, origin/f39)
Author: Cristian Le <[email protected]>
Date: Sun Sep 15 12:04:20 2024 +0200
import rhbz#2296541
Hi thanks for the report
Well I am open to adding a --merge option but it hadn't occurred to me that push should merge. Actually I hardly use push at all, since other commands (build, parallel) push for you.
The reason you want to push is to avoid being prompted?
Maybe you really want --yes (doesn't exist yet)?
I kinda lost the context for this one, it was either that I wanted the merge to happen locally so that I could later push to the fork for PR, or I was trying to do it in a non-release branch and then I wanted to debug the individual commands.
I may consider this in the future, but merge is also delicate: it can mess up branches - so I think this needs some light refactoring of merge code too.