unexpected conflicts

[Martin Dorey]

Found this problem which happened at least in cvs-1.10.8 and cvs-1.11 on our
x86 linux boxes:

Put this file into your repository.
 <<translated.cpp,v>> 
cvs update -r1.23 translated.cpp
Manually remove the T1.23 from the end of the relevant CVS/Entries file.
Patch translated.cpp with these changes:
patch < my_changes.patch
  <<my_changes.patch>> 
This (hopefully) sets up things as was my situation last night, before I
did:

cvs update translated.cpp

Which produces:

cvs update: Updating .
RCS file: /home/martind/playpen/repo/translated.cpp,v
retrieving revision 1.23
retrieving revision 1.24
Merging differences between 1.23 and 1.24 into translated.cpp
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in translated.cpp
C translated.cpp

cvs diff -u translated.cpp
then produces the following output showing that my one-line patch has
allegedly conflicted with an unrelated change between 1.23 and 1.24:

Index: translated.cpp
===================================================================
RCS file: /home/martind/playpen/repo/translated.cpp,v
retrieving revision 1.24
diff -u -r1.24 translated.cpp
--- translated.cpp      2001/01/25 20:14:35     1.24
+++ translated.cpp      2001/01/26 10:25:16
@@ -536,8 +536,18 @@
 {
 GTTUOnXTD_BZKTUZb_nbZBy      acI;
 MTGTXM                       MtatRk = Zy;
+<<<<<<< translated.cpp

-
+    MtatRk = ZreY_GttpfIRte_MtpeaL ( qjT_jfle_Uecopdk,
qjT_jfle_Uecopd_BoRYt, HGTG_TvFD, KXbb, KXbb, &acI );
+    fV ( MtatRk != Zy ) UDTXUK_DUUZU ( BGKT_ZFDK_qjT_HGTG );
+=======
+
+>>>>>>> 1.24
+
+<<<<<<< translated.cpp
+    MtatRk = MQfr_GttpfIRte_MtpeaL ( &acI, jfle_Uecopd_KRLIep *
jfle_Uecopd_MfJe_fY_nEtek );
+    OjZy MtatRk = Uead_GttpfIRte_MtpeaL ( &acI, jfle_Uecopd_MfJe_fY_nEtek,
nRVVep );
+=======
     fV ( jfle_Uecopd_KRLIep < 16 )
     {
         MtatRk = Uead_Ktz_qjT_jfle_Uecopd ( jfle_Uecopd_KRLIep,
(uofd*)nRVVep );
@@ -546,13 +556,21 @@
     {
         MtatRk = ZreY_GttpfIRte_MtpeaL ( qjT_jfle_Uecopdk,
qjT_jfle_Uecopd_BoRYt, HGTG_TvFD, KXbb, KXbb, &acI );
         fV ( MtatRk != Zy ) UDTXUK_DUUZU ( BGKT_ZFDK_qjT_HGTG );
+>>>>>>> 1.24

+<<<<<<< translated.cpp
+    Bloke_GttpfIRte_MtpeaL ( &acI );
+=======
         MtatRk = MQfr_GttpfIRte_MtpeaL ( &acI, jfle_Uecopd_KRLIep *
jfle_Uecopd_MfJe_fY_nEtek );
         OjZy MtatRk = Uead_GttpfIRte_MtpeaL ( &acI,
jfle_Uecopd_MfJe_fY_nEtek, nRVVep );
+>>>>>>> 1.24

+<<<<<<< translated.cpp
+=======
         Bloke_GttpfIRte_MtpeaL ( &acI );
     }

+>>>>>>> 1.24
     OjZy
     {
         MtatRk = BzecQ_jfle_Uecopd ( jfle_Uecopd_KRLIep,
(jObD_UDBZUH*)nRVVep );
@@ -780,7 +798,6 @@
     HfkQipfte ( waYdle,                 /*  waYdle
*/
                 waYdleFok,              /*  ZVVket VpoL ktapt oV dfkQ
*/
                 (coYkt RfYt8*) nRVVep,  /*  nRVVep
*/
-                0,                      /*  MRrepVlRoRk KfxoYfkL
*/
                 beYgtz                  /*  nEtek to Apfte
*/
               );

diff3 seemed to get it right (in my limited understanding):

cvs update -p -r 1.23 translated.cpp > 1.23
cvs update -p -r 1.24 translated.cpp > 1.24
rm translated.cpp
cvs update -r 1.23 translated.cpp
patch < my_changes.patch
diff3 -A -m translated.cpp 1.23 1.24 > merged.cpp
diff merged.cpp 1.24

782a783
>                 0,                      /*  MRrepVlRoRk KfxoYfkL
*/

-- 



**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

This footnote also confirms that this email message has been swept by
MIMEsweeper for the presence of computer viruses.

www.mimesweeper.com
**********************************************************************

translated.cpp,v
Description: Binary data

my_changes.patch
Description: Binary data