From e73bad9c4a9fce6794d95dbd59b299b24e7725a3 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 17 Jan 2016 11:51:21 +0100
Subject: rvi: update how to apply external changes

---
 rvi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rvi b/rvi
index 0d19af1..53ab1da 100755
--- a/rvi
+++ b/rvi
@@ -58,11 +58,10 @@ fi
 owner="`stat -c "%u:%g" "$1"`"
 rcsdiff -u "$1"
 if [ $? -ne 0 ] ; then
-	rcsdiff "$1" > "$1.rvi.diff"
 	echo
 	echo "Differences detected"
 	echo "run 'co $1' to overwrite with last committed version"
-	echo "or 'co -l $1; patch $1 < $1.rvi.diff; ci -u $1; chown $owner $1' to commit"
+	echo "or 'rcs -l $1 && ci -u $1' to commit"
 	exit 1
 fi
 rm -f "$1.rvi.diff"
-- 
cgit v1.2.3