Geoff I am using TortoiseCVS
>From here I see the same as you with both A380.rgb and a380.rgb at http://cvs.flightgear.org/viewvc/data/Aircraft/A380/Models/ I deleted the A380 directory and re-ran CVS, but no conflicts and A380.rgb and not a380.rgb appeared in A380/models. In the past I have seen upper-lower case CVS conflicts. These were reported by others on the forum and quickly fixed. However Tortoise reports no problems at the movement. Perhaps I should give winCVS or CVSNT a whirl to see what happens. Sorry if this is adding to the confusion. Alan -------------------------------------------------- From: "Geoff McLane" <ubu...@geoffair.info> Sent: Saturday, January 02, 2010 12:47 PM To: "FlightGear developers discussions" <flightgear-devel@lists.sourceforge.net> Subject: Re: [Flightgear-devel] Windows CVS update warnings > On Sat, 2010-01-02 at 10:45 +0100, Erik Hofman wrote: >> Ubuntu Air wrote: >> > Hi FG data cvs maintainers, >> > >> > When updating FG data in Windows, I continually, for >> > quite some time now, get the following CVS warnings :- >> > >> > cvs update: move away Aircraft/A380/Models/a380.rgb; it is in the way >> >> It looks like you have local updates that have never been in CVS. If >> that's unintentional you could run cvs up -PdC (in the a380 directory) >> to replace the conflicting files. >> >> Erik > Hi Eric, Alan, > > Thanks for the replies. But what you are suggesting is > that ViewVC also 'lies'. Try say :- > http://cvs.flightgear.org/viewvc/data/Aircraft/A380/Models/ > and you will clearly 'see' there are TWO(2) files listed :- > A380.rgb, _AND_ a380.rgb! > > As stated, this is the SAME for the others checked, but have > NOT checked all... > > And then checking my Ubuntu linux fgfs/data - > ~/fg/fg7/fgfs$ find data/Aircraft/A380/Models -name a380.rgb -type f > data/Aircraft/A380/Models/a380.rgb > ~/fg/fg7/fgfs$ find data/Aircraft/A380/Models -name A380.rgb -type f > data/Aircraft/A380/Models/A380.rgb > showing in my linux cvs 1.12.13, both files get downloaded... > > And just for the record, although I have never really > seen my CVS 1.11.17 GNU WIN32 port 'confused', except on one file > in SG, simgear\magvar\coremag.cxx, which I have written about before, > I did try (a) deleting ALL, which these days takes 'forever' > to do a full fresh FG data checkout, approx. 45K files, 2.7GB, and > (b) deleting the specific directories... > > But the warnings persists... as they should in Windows, > when there are two files of the same name, but just different > case ;=)) > > What cvs client are you using in Windows Alan? And perhaps > more importantly, what is it doing about 2 files of the SAME > name, different case? I have read there are ways to perhaps > configure NTFS to be case sensitive, but have never tried > this, preferring windows 'native' ;=() > > Regards, > > Geoff. > > Windows CVS warnings: > cvs update: move away Aircraft/A380/Models/a380.rgb; it is in the way > cvs update: move away Aircraft/A380/Textures/Livery/House/COWLING.rgb; > it is in the way > cvs update: move away Aircraft/A380/Textures/Livery/House/ENDPLATE.rgb; > it is in the way > cvs update: move away Aircraft/Long-EZ/Nasal/electrical.nas; it is in > the way > cvs update: move away Aircraft/Noratlas/Readme-First; it is in the way > cvs update: move away Aircraft/Zlin-50lx/Models/Lights/Whitelight.xml; > it is in the way > cvs update: move away Aircraft/dhc2/Models/Instruments/kn53.png; it is > in the way > cvs update: move away Aircraft/eurofighter/Models/typhoon.xml; it is in > the way > cvs update: move away > Aircraft/fokker50/Models/instruments/general/nav.rgb; it is in the way > > PS: I normally use cvs up -dPA, and never need -C, since that > particular directory _NEVER_ contains any 'locally modified > files'. If I do make mods, I copy _all_ to a new directory > first, to play, keeping 'C:\FGCVS\FlightGear\data' ONLY for > cvs updates... And although I do get the cvs log emails, this > gives me a second chance to 'review' what has changed ;=)) > > > > ------------------------------------------------------------------------------ > This SF.Net email is sponsored by the Verizon Developer Community > Take advantage of Verizon's best-in-class app development support > A streamlined, 14 day to market process makes app distribution fast and > easy > Join now and get one step closer to millions of Verizon customers > http://p.sf.net/sfu/verizon-dev2dev > _______________________________________________ > Flightgear-devel mailing list > Flightgear-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/flightgear-devel ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
