info-cvs
[Top][All Lists]
Advanced

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

Delta text for revision 1.1 appears twice in *,v file


From: Michael Haggerty
Subject: Delta text for revision 1.1 appears twice in *,v file
Date: Thu, 19 Oct 2006 06:24:13 -0700
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20060922 Thunderbird/1.5.0.7 Mnenhy/0.7.4.666

Hi,

I work on the cvs2svn project (I hope that doesn't make me persona non
grata :-) ) and have a question about a form of CVS repository
corruption that a few of our users have reported.  It could, of course,
result from a botched hand-edit of the file, but since it has been seen
multiple times I was wondering whether it might be the result of a known
CVS or RCS bug.

An example is shown in the attachment.  The problem is that the delta
text for revision 1.1 appears in the file two times.  (In fact, the
delta text appears in the first copy and the full text in the second
copy.)  Empirically, both RCS's "co" and "cvs co" use the first version
of the delta and do not report an error.  RCS's "rlog" prints the log
message from the first version, whereas "cvs log" fails on this file
with an error message.

If this is a known bug, is there an established way to deal with such files?

Thanks in advance,
Michael
head    1.3;
access;
symbols
        uves_2_7_0:1.3
        uves_2_6_0_bis:1.3
        uves_2_6_0:1.3
        uves_2_5_6_pso:1.3
        uves_2_5_6:1.3
        uves_2_5_1:1.3
        uves_2_4_5:1.3
        uves_2_4_4:1.3
        uves_2_4_1:1.3
        uves_2_4_0b0:1.3
        uves_2_4_0:1.3
        uves_2_3_3_new_fits_pro:1.3
        uves_2_3_0b3:1.3
        uves_2_3_0b2:1.3
        UVES_2_3_0:1.3
        uves_2_3_0_PSO:1.3
        uves_2_3_0:1.3
        uves_2_2_4:1.3
        uves_2_2_3:1.3
        uves_2_2_0_cdrom:1.3
        uves_2_2_0:1.3
        uves_2_1_7:1.3
        uves_2_1_6:1.3
        uves_2_1_5:1.3
        CDROM-2-1-0:1.3
        uves-2-1-0-end-com:1.3
        uves-2-1-0-pso-cor:1.3
        uves-2-1-0-b8:1.3
        REL2-1-0:1.3
        release-2-1-0-b7:1.3
        UVES-2-1-0-b7:1.3
        uves-2-1-0-b7:1.3
        uves-2-1-0-b6:1.3
        uves-2-1-0-b5:1.3
        uves-2-1-0-b4:1.3
        uves-2-1-0-b3:1.3
        uves-2-1-0-b2:1.3
        UVES-2-1-0-b1:1.3
        uves-2-1-0-b1:1.3
        uves_2_1_0_b1:1.3
        patch-2-0-7:1.3
        uves_2_0_5:1.3
        uves_2_0_4:1.3
        uves_2_0_3:1.3
        uves_2_0_2:1.3
        uves_2_0_1:1.3
        uves_2_0_0_end:1.3
        uves-2_0_0_CDROM:1.3
        uves-2_0_0:1.3
        uves_2_0_0:1.3
        uves_1_8_1:1.1
        uves_1_8_0_ci:1.1
        UVES-1_8_0:1.1
        UVES-save:1.1
        UVES-saved:1.1
        UVES-1_6_4:1.1
        UVES-1_6_0b1:1.1
        UVES-1_6_0:1.1
        UVES-1_4_0_forFLAMES_oct_com:1.1
        UVES-1_4_0:1.1
        UVES-1_3_5:1.1
        UVES-1_3_3-beta2:1.1
        UVES-1_3_3:1.1
        UVES-1_3_1:1.1
        UVES-1_3_0-beta6:1.1
        UVES-1_3_0-beta5:1.1
        UVES-1_3_0-beta4:1.1
        UVES-1_3_0-beta3:1.1
        UVES-1_3_0-beta2:1.1
        UVES-1_3_0-beta1a:1.1;
locks; strict;
comment @# @;


1.3
date    2003.06.30.12.59.08;    author amodigli;        state Exp;
branches;
next    1.2;

1.2
date    2003.06.30.12.54.52;    author amodigli;        state Exp;
branches;
next    1.1;

1.1
date    2002.02.11.17.59.51;    author amodigli;        state Exp;
branches;
next    ;


desc
@*** empty description ***
@


1.3
log
@uves-2.0.0-rep
@
text
@      COMMON /QC_LOG/MID_S_N_CENT,OBJ_POS_CENT,
     +               FWHM,N_CURR_ORD     !to not pass a parameter to G_PROF
@


1.2
log
@uves-2.0.0
@
text
@@


1.1
log
@1st release
@
text
@@


1.1
log
@Created
@
text
@      COMMON /QC_LOG/MID_S_N_CENT,OBJ_POS_CENT,
     +               FWHM,N_CURR_ORD     !to not pass a parameter to G_PROF
@

reply via email to

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