Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: review
Title: QC Management and Helpers
Version: 3.12.1.9000
Version: 3.12.1.9001
Authors@R:
c(
person(given = "Eric", family = "Anderson", email = "andersone@metrumrg.com", role = c("aut")),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Removed functions `compareTables` and `compareFigures` as `compareDashboard` is an improved solution. (#187)

## Bug fixes

- Updated `diffQCed` error message when file is out of sync with SVN. (#188)

# review 3.12.1

## Bug fixes
Expand Down
7 changes: 6 additions & 1 deletion R/diffQced.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
#' The output will appear in the viewer and only rows where there have been
#' additions, deletions or modifications in the script will be shown.
#'
#' @details
#' The file must be part of an SVN working copy that is in sync with the repo.
#' If the local copy is out of date or has local modifications, the function
#' will stop and prompt you to update or review local changes.
#'
#' @param .file file path from working directory
#' @param .side_by_side Logical. Should diffs be displayed side by side?
#' @param .ignore_white_space Logical. Should white space be ignored?
Expand All @@ -31,7 +36,7 @@ diffQced <- function(.file,

if (!inherits(up_to_date, "error")) {
if (!is.null(up_to_date$target$entry)) {
stop("Please svn up '", .file, "' before running comparison")
stop("The local copy of '", .file, "' is out of sync with the repo. Please svn up or check the local copy for changes.")
}
}

Expand Down
5 changes: 5 additions & 0 deletions man/diffQced.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.