[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: cvs 1.11.10 fails to detect deletion conflict

From: Paul Edwards
Subject: Re: cvs 1.11.10 fails to detect deletion conflict
Date: Sun, 28 Dec 2003 06:48:02 GMT

This is the case where it should not detect a conflict,
even though the revision numbers are all different,
there is actually no genuine change, so no conflict:

rm -fr o:\cvstesttest
mkdir o:\cvstesttest
mkdir o:\cvstesttest\CVSROOT
set CVSROOT=o:\cvstesttest

rm -fr o:\cvstesttest\tempmerge

rm -fr combine
rm -fr base
rm -fr pvcs
rm -fr project

mkdir combine
mkdir base
mkdir pvcs
mkdir project

echo "aaa" >base\file.txt
echo "aaa" >pvcs\file.txt
echo "ccc" >project\xxx.txt

cd base
cvs import -b 1.1.101 -ko -m "base import" tempmerge base base-1

cd ..\pvcs
cvs import -b 1.1.201 -ko -m "pvcs import" tempmerge pvcs pvcs-1

cd ..\project
cvs import -b 1.1.301 -ko -m "project import" tempmerge project project-1

cd ..
cvs checkout -r pvcs-1 -j base-1 -j project-1 -d combine tempmerge

rem rm -fr o:\cvstesttest

reply via email to

[Prev in Thread] Current Thread [Next in Thread]