From 0181d28c643d5e18e4303a104ef0efd04c7592fc Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 12 Oct 2005 20:32:27 +0000 Subject: Handle owner stuff git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@28 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede --- rvi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rvi b/rvi index c43226b..1e0ce3d 100755 --- a/rvi +++ b/rvi @@ -12,18 +12,20 @@ if ! [ -e "$1,v" ] && ! [ -e "$DN/RCS/$BN,v" ] ; then exit 1 fi +owner=`stat -c "%u:%g" cgi.cfg` 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' to commit" + echo "or 'co -l $1; patch $1 < $1.rvi.diff; ci -u $1' to commit; chown $owner $1" exit 1 fi rm -f $1.rvi.diff co -l $1 +chown $owner $1 if [ $? -ne 0 ] ; then echo "Check out failed." echo "Maybe someone else is currently editing this file." @@ -32,4 +34,4 @@ if [ $? -ne 0 ] ; then fi /usr/bin/vim $1 ci -u $1 - +chown $owner $1 -- cgit v1.2.3