Better handling of edge cases

Author: jonico

.pscale/cli-helper-scripts/wait-for-deploy-request-merged.sh

@@ -37,16 +37,16 @@ function wait_for_deploy_request_merged {
                 echo  "Deploy request $number is not ready after $retries retries. Exiting..."
                 return 2
             fi
-            echo  "Deploy-request $number is not merged yet. Current status:"
+            echo  "Deploy-request $number is not deployed yet. Current status:"
             echo "show vitess_migrations\G" | pscale shell "$db" main --org "$org"
             echo "Retrying in $wait seconds..."
             sleep $wait
-        elif [ "$output" = "\"complete\"" ]; then
-            echo  "Deploy-request $number has been merged successfully."
+        elif [ "$output" = "\"complete\"" ] || [ "$output" = "\"complete_pending_revert\"" ]; then
+            echo  "Deploy-request $number has been deployed successfully."
             return 0
         else
             echo  "Deploy-request $number with unknown status: $output"
             return 3
         fi
     done
-}
+}