From 38ebaac869bacedd89aa885b0dadafa59874774d Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Mon, 8 Nov 2021 03:39:18 +0000
Subject: [PATCH] dev-cmd/bottle: fix pkg_version comparison on merge

---
 Library/Homebrew/dev-cmd/bottle.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index be0f42f15f..756df0a4ee 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -626,9 +626,15 @@ module Homebrew
 
       path = HOMEBREW_REPOSITORY/bottle_hash["formula"]["path"]
       formula = Formulary.factory(path)
+
       old_bottle_spec = formula.bottle_specification
+      old_pkg_version = formula.pkg_version
+      FormulaVersions.new(formula).formula_at_revision("origin/HEAD") do |upstream_f|
+        old_pkg_version = upstream_f.pkg_version
+      end
+
       old_bottle_spec_matches = old_bottle_spec &&
-                                bottle_hash["formula"]["pkg_version"] == formula.pkg_version.to_s &&
+                                bottle_hash["formula"]["pkg_version"] == old_pkg_version.to_s &&
                                 bottle.root_url == old_bottle_spec.root_url &&
                                 old_bottle_spec.collector.tags.present?