"Conflicts during checkout" when attempting to cvs MOZILLA_1_7_BRANCH
Bruce Robson
i.e. it was the source tree used to build the most recent official release
(1.7.12) from the 1.7 branch.
I attempted to update it using CVS so that it matched the Mozilla 1.7
branch. I succesfully used the command
cvs up -dr MOZILLA_1_7_BRANCH client.mk
I then used the command
make -f client.mk
This ran for almost 45 minutes and then failed with the messages
M mozilla/mailnews/base/resources/content/mailContextMenus.js
U mozilla/mailnews/compose/src/nsMsgCompose.cpp
U mozilla/mailnews/compose/src/nsMsgCompose.h
M mozilla/mailnews/extensions/palmsync/palm.html
M mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsp
checkout finish: Fri Mar 24 16:25:59 GMTST 2006
make: *** Conflicts during checkout.
C mozilla/security/nss/lib/pki1/oiddata.c
C mozilla/security/nss/lib/pki1/oiddata.h
C mozilla/security/nss/lib/pki1/oidgen.perl
C mozilla/security/nss/lib/pki1/pki1.h
make: Refer to /cygdrive/c/files/cvsco.log for full log.
make[1]: *** [real_checkout] Error 1
make[1]: Leaving directory `/cygdrive/c/files'
make: *** [checkout] Error 2
Some of the lines in /cygdrive/c/files/cvsco.log are
M mozilla/security/nss/lib/pki1/nsspki1t.h
RCS file: /cvsroot/mozilla/security/nss/lib/pki1/oiddata.c,v
retrieving revision 1.1
retrieving revision 1.1.126.1
Merging differences between 1.1 and 1.1.126.1 into oiddata.c
rcsmerge: warning: conflicts during merge
cvs checkout: conflicts found in mozilla/security/nss/lib/pki1/oiddata.c
C mozilla/security/nss/lib/pki1/oiddata.c
RCS file: /cvsroot/mozilla/security/nss/lib/pki1/oiddata.h,v
retrieving revision 1.1
retrieving revision 1.1.126.1
Merging differences between 1.1 and 1.1.126.1 into oiddata.h
rcsmerge: warning: conflicts during merge
cvs checkout: conflicts found in mozilla/security/nss/lib/pki1/oiddata.h
C mozilla/security/nss/lib/pki1/oiddata.h
RCS file: /cvsroot/mozilla/security/nss/lib/pki1/oidgen.perl,v
retrieving revision 1.2
retrieving revision 1.2.126.1
Merging differences between 1.2 and 1.2.126.1 into oidgen.perl
rcsmerge: warning: conflicts during merge
cvs checkout: conflicts found in mozilla/security/nss/lib/pki1/oidgen.perl
C mozilla/security/nss/lib/pki1/oidgen.perl
M mozilla/security/nss/lib/pki1/oids.txt
RCS file: /cvsroot/mozilla/security/nss/lib/pki1/pki1.h,v
retrieving revision 1.2
retrieving revision 1.2.132.1
Merging differences between 1.2 and 1.2.132.1 into pki1.h
rcsmerge: warning: conflicts during merge
cvs checkout: conflicts found in mozilla/security/nss/lib/pki1/pki1.h
C mozilla/security/nss/lib/pki1/pki1.h
M mozilla/security/nss/lib/pki1/pki1t.h
There is a thread on forums.mozillazine.org where someone else got the error
"Conflicts during checkout" on different files.
http://forums.mozillazine.org/viewtopic.php?p=1649504&sid=4e28839a2553d3e9966a9d51a069b097
This thread contains the advice "The easy fix is to just delete this file and
run the checkout again.".
What causes the error ?
Is deleting the files the best way to proceed ?
Bruce Robson
> I had a source tree that came from mozilla-1.7.12-source.tar.bz2
> i.e. it was the source tree used to build the most recent official
> release (1.7.12) from the 1.7 branch.
>
> I attempted to update it using CVS so that it matched the Mozilla 1.7
> branch. I succesfully used the command
> cvs up -dr MOZILLA_1_7_BRANCH client.mk
>
> I then used the command
> make -f client.mk
> This ran for almost 45 minutes and then failed with the messages
> make: *** Conflicts during checkout.
> C mozilla/security/nss/lib/pki1/oiddata.c
> C mozilla/security/nss/lib/pki1/oiddata.h
> C mozilla/security/nss/lib/pki1/oidgen.perl
> C mozilla/security/nss/lib/pki1/pki1.h
> make: Refer to /cygdrive/c/files/cvsco.log for full log.
> make[1]: *** [real_checkout] Error 1
> make[1]: Leaving directory `/cygdrive/c/files'
> make: *** [checkout] Error 2
I have now found that these 4 files are the 4 files changed to fix bug 284386
https://bugzilla.mozilla.org/show_bug.cgi?id=284386
I'm still trying to work out what to do.
Bruce Robson
My conclusion is that these errors are caused by the files having special
character sequences that make CVS put the branch identity in the checked out
file and there having actually been a change made to the files since 1.7.12.
The change made means that CVS needs to get a different revision of the file.
The new revision now has differences due to both the actual change made and the
change from MOZILLA_1_7_12_RELEASE to MOZILLA_1_7_BRANCH. This RELEASE to BRANCH
change is what causes the conflict.
I have chosen to proceed by deleting all files (except ENTRIES and TAG in the
CVS directories) that contain "MOZILLA_1_7_12_RELEASE". This stops the
"Conflicts during checkout" error and ensures that no file is left with the
MOZILLA_1_7_12_RELEASE string.