diff --git a/R/bump-version.R b/R/bump-version.R index 10b8056f0..d3e462e15 100644 --- a/R/bump-version.R +++ b/R/bump-version.R @@ -40,6 +40,13 @@ bump_version_impl <- function(fledgeling, write_fledgling(out) #' - If `"dev"`, [finalize_version()] with `push = FALSE` finalize_version_impl(push = FALSE, suggest_finalize = edit) + } else if (which %in% c("pre-minor", "pre-major")) { + #' - If `"pre-minor"` or `"pre-major"`, merging NEWS from second-level headers and [finalize_version()] with `push = FALSE` + # FIXME: Cleaner API, perhaps put merge_dev_news() back into update_news_impl() + # FIXME: Add test + out <- merge_dev_news(out, as.character(out$version)) + write_fledgling(out) + finalize_version_impl(push = FALSE, suggest_finalize = edit) } else { write_fledgling(out) #' - Otherwise, [commit_version()]. diff --git a/man/bump_version.Rd b/man/bump_version.Rd index 0cf897fd2..c3c8c8bd3 100644 --- a/man/bump_version.Rd +++ b/man/bump_version.Rd @@ -52,6 +52,7 @@ if \code{check_default_branch = TRUE} (the default). \item Depending on the \code{which} argument: \itemize{ \item If \code{"dev"}, \code{\link[=finalize_version]{finalize_version()}} with \code{push = FALSE} +\item If \code{"pre-minor"} or \code{"pre-major"}, merging NEWS from second-level headers and \code{\link[=finalize_version]{finalize_version()}} with \code{push = FALSE} \item Otherwise, \code{\link[=commit_version]{commit_version()}}. } }