On Fri, Jul 07, 2023 at 09:22:22AM -0700, Jeff Davis wrote: > On Thu, 2023-07-06 at 22:14 -0700, Nathan Bossart wrote: >> Since we are only reverting from v16, the REL_16_STABLE catversion >> will be >> bumped ahead of the one on master. > > I don't object to you doing it this way, but FWIW, I'd just revert in > both branches to avoid this kind of weirdness. > > Also I'm not quite sure how quickly my search_path fix will be > committed. Hopefully soon, because the current state is not great, but > it's hard for me to say for sure.
Yeah, I guess I should just revert it in both. Given your fix will hopefully be committed soon, I was hoping to avoid reverting and un-reverting in quick succession to prevent affecting git-blame too much. I found an example of a post-beta2 revert on both master and a stable branch where Tom set the catversions to different values (20b6847, e256312). I'll do the same here. -- Nathan Bossart Amazon Web Services: https://aws.amazon.com
