tag_build.py#L123: Merging a branch named "master" doesn't work

[nicoboss]

The working pull request https://github.com/citra-emu/citra/pull/2673 doesn't get merged into bleeding edge due to a bug in lemonbot. This issue occures while merging a branch named "master".

In the mergelog it gets wrongly marked as merged although it isn't (it's not in the sourcecode nor in the commit history after running the bot):

PR	Ref	Commit	Author	Status
31	jit-experiments	8618d38406310a483d8eafc099e5a24e8b06289e	MerryMage	Merged
19	pipe3	acc09857d575a2663dae64deaedbbf7f5cb984c8	MerryMage	Merged
17	bleeding-edge-base	adc9be65da6570a4c53493124f5e5147f06dd9a2	jroweboy	Merged
5	jfr-fix-batch-errors	4f4326d0cf0f7a5e23057df89acf8f0aafa19f41	jroweboy	Merged
2673	master	5c9c608ab67e38c1c1add8adce7dc59489edaa34	nicoboss	Merged
2661	uds5	9a07561ea697e939f4ee2432d3dd75d36c36a0d1	Subv	Merged
2611	missing-file-dialogs	0a18df21aaaf65b740c1b66710559fd2b5312b67	TheKoopaKingdom	Merged
2606	ir	853a02fcdd19c4053b5bb650c97ba4a7ae6a0493	wwylele	Merged
2406	session_disconnect	062f84e65551a41b12d5c55ba720befb19644f55	Subv	Merged

Some important quotes from Discord:

nicoboss - heute um 18:32 Uhr "jroweboy added the pr:bleeding-edge-merge label 41 minutes ago" and "citrabot released this (bleeding-edge-281) 41 minutes ago" so why isn't pr 2673 in this bleeding-edge build?

wwylele - heute um 18:44 Uhr random guess: because the branch is named "master" so the bot gets confused?

JayFoxRox - ̗̀🚤 ̖́- - heute um 18:47 Uhr it merges by the PR refs https://github.com/citra-emu/bleeding-edge-bot/blob/master/tag_build.py#L123 , so shouldn't be a problem

nicoboss - heute um 19:13 Uhr So you are using the commit-hash of the last commit (In this case 5c9c608ab67e38c1c1add8adce7dc59489edaa34) and not the branch name (named as "Ref" in the logfile)?

JayFoxRox - ̗̀🚤 ̖́- - heute um 19:16 Uhr https://api.github.com/repos/citra-emu/citra/pulls/2673 does indeed use "ref: master" we should fix that https://github.com/citra-emu/bleeding-edge-bot/blob/master/tag_build.py#L108 < this is what I expected, but we use different techniques for fetch and merge https://github.com/citra-emu/bleeding-edge-bot/blob/master/tag_build.py#L123

[jroweboy]

The reason is as JayFoxRox says, it fetch the remote branch locally using the name of the remote branch to create the branch locally. Which in the case of master, the branch already exists so it fails to fetch your changes and then tries to merge the current master into the branch (which does nothing since the bleeding-edge branch is already based off master)

Fixing this would involve changing the local name to be something that wouldn't conflict, such as git revision or something else.

[JayFoxRox]

I consider closing this as it's not an issue with BE per-se. The correct name for this issue would be "PR 2673 mentioned as merged but not actually merged". The issue described here is in the bleeding-edge-bot, see issue @jroweboy referenced from.