Pass -q to cvs diff and update. Closes: #673367

diff --git a/debian/changelog b/debian/changelog
index e6fc2e321d01f65be522864b707da5fb9e560c43..c5c31f8596ba4ed5ac3643b4ff486397a18c0baf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (1.13) UNRELEASED; urgency=low
+
+  * Pass -q to cvs diff and update. Closes: #673367
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 18 May 2012 12:27:45 -0400
+
 mr (1.12) unstable; urgency=low
 
   * Ignore nonzero exit status of hg pull, which can happen

diff --git a/mr b/mr
index 556366ca4db806f10365ce5d65df812df7e78fa6..21d267739d2f5a1fe90aa1e925918d4efc22b52b 100755 (executable)
--- a/mr
+++ b/mr
@@ -1890,7 +1890,7 @@ bzr_update =
        else
                bzr merge --pull "$@"
        fi
-cvs_update = cvs update "$@"
+cvs_update = cvs -q update "$@"
 hg_update  = hg pull "$@"; hg update "$@"
 darcs_update = darcs pull -a "$@"
 fossil_update = fossil pull "$@"
@@ -1948,7 +1948,7 @@ veracity_push = vv push "$@"
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"
-cvs_diff = cvs diff "$@"
+cvs_diff = cvs -q diff "$@"
 hg_diff  = hg diff "$@"
 darcs_diff = darcs diff -u "$@"
 fossil_diff = fossil diff "$@"