This - "cvs checkout: move away mozilla/.cvsignore; it is in the way" what does it mean

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

This - "cvs checkout: move away mozilla/.cvsignore; it is in the way" what does it mean

gmgj
This is the beginning of my cvsco.log file

checkout start: Thu Mar 29 19:38:16 EDT 2007
? mozilla/security/nss/cmd/shlibsign/NONE
? mozilla/security/nss/cmd/shlibsign/mangle/NONE
? mozilla/security/nss/lib/ckfw/builtins/NONE
? mozilla/security/nss/lib/freebl/NONE
? mozilla/security/nss/lib/nss/NONE
? mozilla/security/nss/lib/smime/NONE
? mozilla/security/nss/lib/softoken/NONE
? mozilla/security/nss/lib/ssl/NONE
? mozilla/.cvsignore
cvs checkout: move away mozilla/.cvsignore; it is in the way
C mozilla/.cvsignore
U mozilla/Makefile.in

I am not sure if I am supposed to move the file or that the C
mozilla/.cvsignore is doing it for me.
Can someone please clarify this for me?

My mozilla/.cvsignore file
dist
Makefile
config.log
config.cache
config.status
.client-defs.mk
config-defs.h
.mozconfig
.mozconfig.mk
.mozconfig.out
a.out
unallmakefiles
nss
mozilla-config.h

_______________________________________________
dev-builds mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-builds
Reply | Threaded
Open this post in threaded view
|

Re: This - "cvs checkout: move away mozilla/.cvsignore; it is in the way" what does it mean

James Ross
gmgj wrote:

> This is the beginning of my cvsco.log file
>
> checkout start: Thu Mar 29 19:38:16 EDT 2007
> ? mozilla/security/nss/cmd/shlibsign/NONE
> ? mozilla/security/nss/cmd/shlibsign/mangle/NONE
> ? mozilla/security/nss/lib/ckfw/builtins/NONE
> ? mozilla/security/nss/lib/freebl/NONE
> ? mozilla/security/nss/lib/nss/NONE
> ? mozilla/security/nss/lib/smime/NONE
> ? mozilla/security/nss/lib/softoken/NONE
> ? mozilla/security/nss/lib/ssl/NONE
> ? mozilla/.cvsignore
> cvs checkout: move away mozilla/.cvsignore; it is in the way
> C mozilla/.cvsignore
> U mozilla/Makefile.in
>
> I am not sure if I am supposed to move the file or that the C
> mozilla/.cvsignore is doing it for me.
> Can someone please clarify this for me?

Generally speaking, you should rename it. The line starting "?"
identifies the file as existing but not under CVS' control. It then
rightly gets upset as it wants to put a file of the same name there. The
line starting "C" is CVS saying that the file has issues (in this case
the aforementioned name collision).

It's quite possible the file was originally put there by CVS and you've
done nothing - it does get confused sometimes. My usual actions:

  - Rename the file it doesn't like.
  - Re-run the update/checkout that had the issue.
  - Assuming it didn't get upset again, compare the renamed and new
files, deleting the renamed one if they are identical.
  - If they are not identical, consider whether the changes are still
needed for anything; if they are, apply them to the new file - CVS will
not mind this, it will just understand you have made some changes and
leave them there.

Hope that helps.

--
James Ross <[hidden email]>
ChatZilla and Venkman Developer
_______________________________________________
dev-builds mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-builds