From: Jason Williams <[EMAIL PROTECTED]>
Subject: CVS Code Freeze and 1.11 Test Release Available
Date: Wed, 30 Aug 2000 12:02:18 +0900 (JST)
| Bugs should be reported to [EMAIL PROTECTED]; see the README file in the
Will be "cvs update -C bug" fixed?
>> X-Mailing-List: <[EMAIL PROTECTED]> archive/latest/15769
>> Subject: cvs up -C bug(s)
>> From: "Noel L Yap" <[EMAIL PROTECTED]>
>> To: [EMAIL PROTECTED]
>> Date: Thu, 9 Mar 2000 04:09:21 +0900 (JST)
>>
>> "cvs up -C file" doesn't work correctly if "file" has been modified
>> both in the repo and the working directory (ie a merge is "needed").
>> IMO, you should wind up with a clean repo copy (ie no merge). The
>> default repo copy should be the HEAD (for consistency -- does anyone
>> know of an easy way to specify the base rev?). There's also a problem
>> with sticky tags when specifying "-r" with it (specifying "-A" on the
>> same command line doesn't seem to help).
--
KOIE Hidetaka <[EMAIL PROTECTED]>
#!/bin/sh -x
CVS=/tmp/cvs
CVS_SERVER_SLEEP=1
abort() {
echo "***** Aborted."
exit 1
}
examine() {
METHOD=$1
CVSROOTDIR=$2
CVSROOT=:$1:$2
export CVSROOT
FILE=file.txt
echo "*** Init."
[ -d $CVSROOTDIR ] && rm -rf $CVSROOTDIR
$CVS init || abort
echo "*** Import."
[ -d mod ] && rm -rf mod
mkdir mod
cd mod
cat > $FILE << EOF
111
EOF
$CVS import -m "" mod BRANCH RELEASE-1 || abort
cd ..
rm -rf mod
###echo "*** Advance the revision."
###[ -d mod ] && rm -rf mod
###$CVS co mod || abort
###cd mod
###$CVS ci -f -m "" $FILE
###cd ..
echo "*** Checkouts."
[ -d mod1 ] && rm -rf mod1
$CVS co -d mod1 mod || abort
[ -d mod2 ] && rm -rf mod2
$CVS co -d mod2 mod || abort
echo "*** Commit."
cd mod1
cat > $FILE << EOF
111
222
EOF
$CVS ci -m "" $FILE || abort
cd ..
echo "*** Make a conflict."
cd mod2
cat > $FILE << EOF
000
111
EOF
$CVS -n -q update $FILE || abort
$CVS status $FILE || abort
echo "*** Overwrite."
env CVS_SERVER_SLEEP=$CVS_SERVER_SLEEP $CVS -t update -C $FILE ##|| abort
}
examine local `pwd`/repo 2>&1 | tee local.out
examine fork `pwd`/repo 2>&1 | tee fork.out
