From 930eed239c99be055ef4919176cd2c5ba290b6b4 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 7 Dec 2017 10:54:24 -0500 Subject: [PATCH] Fixes PRs getting test merged if they were merged upstream --- TGS.ControlPanel/TestMergeManager.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TGS.ControlPanel/TestMergeManager.cs b/TGS.ControlPanel/TestMergeManager.cs index a89ce7a452..ee2c14a183 100644 --- a/TGS.ControlPanel/TestMergeManager.cs +++ b/TGS.ControlPanel/TestMergeManager.cs @@ -239,7 +239,10 @@ namespace TGS.ControlPanel var S = (string)PullRequestListBox.Items[I]; string mergedSha = null; var splits = S.Split(' '); - if((S.Contains(" - OUTDATED: " ) || S.Contains(" - MERGED ON REMOTE: ")) && PullRequestListBox.GetItemCheckState(I) == CheckState.Indeterminate) + var mergedOnRemote = S.Contains(" - MERGED ON REMOTE: "); + if (mergedOnRemote && UpdateToRemoteRadioButton.Checked) + continue; + if ((S.Contains(" - OUTDATED: " ) || mergedOnRemote) && PullRequestListBox.GetItemCheckState(I) == CheckState.Indeterminate) mergedSha = splits[splits.Length - 1]; var key = Convert.ToInt32((splits[0].Substring(1))); try