Merge pull request #7920 from dawidd6/pr-upload-keep-old

dev-cmd/pr-upload: add --keep-old flag

Library/Homebrew/dev-cmd/pr-upload.rb

@@ -15,6 +15,9 @@ module Homebrew
       EOS
       switch "--no-publish",
              description: "Apply the bottle commit and upload the bottles, but don't publish them."
+      switch "--keep-old",
+             description: "If the formula specifies a rebuild version, " \
+                          "attempt to preserve its value in the generated DSL."
       switch "-n", "--dry-run",
              description: "Print what would be done rather than doing it."
       switch "--warn-on-upload-failure",
@@ -38,6 +41,7 @@ module Homebrew
     bottle_args = ["bottle", "--merge", "--write"]
     bottle_args << "--verbose" if args.verbose?
     bottle_args << "--debug" if args.debug?
+    bottle_args << "--keep-old" if args.keep_old?
     bottle_args << "--root-url=#{args.root_url}" if args.root_url
     odie "No JSON files found in the current working directory" if Dir["*.json"].empty?
     bottle_args += Dir["*.json"]

docs/Manpage.md

@@ -924,6 +924,8 @@ Apply the bottle commit and publish bottles to Bintray.
 
 * `--no-publish`:
   Apply the bottle commit and upload the bottles, but don't publish them.
+* `--keep-old`:
+  If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL.
 * `-n`, `--dry-run`:
   Print what would be done rather than doing it.
 * `--warn-on-upload-failure`:

manpages/brew.1

@@ -1211,6 +1211,10 @@ Apply the bottle commit and publish bottles to Bintray\.
 Apply the bottle commit and upload the bottles, but don\'t publish them\.
 .
 .TP
+\fB\-\-keep\-old\fR
+If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL\.
+.
+.TP
 \fB\-n\fR, \fB\-\-dry\-run\fR
 Print what would be done rather than doing it\.
 .