[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
cvs 1.11.10 fails to detect deletion conflict
From: |
Paul Edwards |
Subject: |
cvs 1.11.10 fails to detect deletion conflict |
Date: |
Thu, 11 Dec 2003 13:31:04 GMT |
I came extremely close to getting my fingers burnt again
today. The problem is that if we have a base, and one
person has modified the file, but the other person has
deleted that same file, when I come to do a merge, one
way CVS detects, the other way it is silent.
If I am on the branch where the file is deleted, I'll get a
warning from CVS "hey, I can't apply this change, the
file is not there!", but if I have the modified file in my
branch, and then an incoming deletion request comes,
CVS happily actions it.
Instead, I would expect it at the very least to issue a
warning message saying that the file has been modified,
changes will be lost.
Here is what is needed to demonstrate the problem:
It was pure luck that I wasn't burnt. I have had to update
my procedure to say "deleted files need to be manually
diffed to see the changes that will be lost". But it is a long
way from failsafe.
BFN. Paul.
# This script demonstrates a problem with CVS 1.11.10 when
# a file is deleted. No conflict or warning is produced.
mkdir /tmp/cvsroot
mkdir /tmp/cvsroot/CVSROOT
export CVSROOT=/tmp/cvsroot
rm -fr $CVSROOT/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 "bbb" >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
>conflicts.txt 2>&1
rm -fr /tmp/cvsroot
- cvs 1.11.10 fails to detect deletion conflict,
Paul Edwards <=