From d5c8f2e102ab0262ab91a9ce14e95ddb50097039 Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Fri, 14 Aug 2020 13:40:21 +0200
Subject: [PATCH] pr-pull: pass --keep-old option to pr-upload

also fix typo in `--root-url` option
---
 Library/Homebrew/dev-cmd/pr-pull.rb | 6 +++++-
 docs/Manpage.md                     | 2 ++
 manpages/brew.1                     | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb
index 052e5dbdbc..0b0951c8b4 100644
--- a/Library/Homebrew/dev-cmd/pr-pull.rb
+++ b/Library/Homebrew/dev-cmd/pr-pull.rb
@@ -28,6 +28,9 @@ module Homebrew
              description: "Print what would be done rather than doing it."
       switch "--clean",
              description: "Do not amend the commits from pull requests."
+      switch "--keep-old",
+             description: "If the formula specifies a rebuild version, " \
+                          "attempt to preserve its value in the generated DSL."
       switch "--branch-okay",
              description: "Do not warn if pulling to a branch besides master (useful for testing)."
       switch "--resolve",
@@ -262,8 +265,9 @@ module Homebrew
           upload_args << "--verbose" if args.verbose?
           upload_args << "--no-publish" if args.no_publish?
           upload_args << "--dry-run" if args.dry_run?
+          upload_args << "--keep-old" if args.keep_old?
           upload_args << "--warn-on-upload-failure" if args.warn_on_upload_failure?
-          upload_args << "--root_url=#{args.root_url}" if args.root_url
+          upload_args << "--root-url=#{args.root_url}" if args.root_url
           upload_args << "--bintray-org=#{bintray_org}"
           safe_system HOMEBREW_BREW_FILE, *upload_args
         end
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 81b707e25b..a3a741ae70 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -1034,6 +1034,8 @@ Requires write access to the repository.
   Print what would be done rather than doing it.
 * `--clean`:
   Do not amend the commits from pull requests.
+* `--keep-old`:
+  If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL.
 * `--branch-okay`:
   Do not warn if pulling to a branch besides master (useful for testing).
 * `--resolve`:
diff --git a/manpages/brew.1 b/manpages/brew.1
index 57599f62e3..f1915f3b37 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1424,6 +1424,10 @@ Print what would be done rather than doing it\.
 Do not amend the commits from pull requests\.
 .
 .TP
+\fB\-\-keep\-old\fR
+If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL\.
+.
+.TP
 \fB\-\-branch\-okay\fR
 Do not warn if pulling to a branch besides master (useful for testing)\.
 .