summaryrefslogtreecommitdiff
path: root/rvi
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2016-01-17 11:51:21 +0100
committerPeter Palfrader <peter@palfrader.org>2016-01-17 11:51:21 +0100
commite73bad9c4a9fce6794d95dbd59b299b24e7725a3 (patch)
tree15549e17e3e801553cb3d01eb519026cb4028761 /rvi
parenta71b26eafea578db15551952c01bfb5d79520dc0 (diff)
rvi: update how to apply external changes
Diffstat (limited to 'rvi')
-rwxr-xr-xrvi3
1 files changed, 1 insertions, 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"