bug-cvs
[Top][All Lists]
Advanced

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

RE: cvs 1.11.10 fails to detect deletion conflict


From: Jim.Hyslop
Subject: RE: cvs 1.11.10 fails to detect deletion conflict
Date: Thu, 11 Dec 2003 10:02:22 -0500

Paul Edwards [mailto:address@hidden wrote:
> 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.
This description does not match the sequence of steps you outlined below,
but in any case...

> # This script demonstrates a problem with CVS 1.11.10 when
> # a file is deleted.  No conflict or warning is produced.
[...]
> 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
It seems the lack of error message was recently introduced. At this point,
using 1.11.5, I got an error message:

address@hidden:$ cvs import -b 1.1.201 -ko -m "pvcs import" tempmerge pvcs
pvcs
-1
C tempmerge/file.txt

1 conflicts created by this import.
Use the following command to help the merge:

        cvs checkout -j<prev_rel_tag> -jpvcs-1 tempmerge

-- 
Jim Hyslop 
Senior Software Designer 
Leitch Technology International Inc. (<http://www.leitch.com/>) 
Columnist, C/C++ Users Journal (<http://www.cuj.com/experts>) 





reply via email to

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