On Sun, Jan 3, 2010 at 12:40 AM, Csaba Halász <csaba.hal...@gmail.com>wrote:
> On Sat, Jan 2, 2010 at 2:23 PM, Alan Teeder <ajtee...@v-twin.org.uk> > wrote: > > > > >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. > > I am on linux and can confirm that there are indeed two files > differing in case _and_ content: > > $ cvs status A380.rgb a380.rgb > =================================================================== > File: A380.rgb Status: Up-to-date > > Working revision: 1.1 > Repository revision: 1.1 > /var/cvs/FlightGear-0.9/data/Aircraft/A380/Models/A380.rgb,v > Sticky Tag: (none) > Sticky Date: (none) > Sticky Options: -kb > > =================================================================== > File: a380.rgb Status: Up-to-date > > Working revision: 1.1 > Repository revision: 1.1 > /var/cvs/FlightGear-0.9/data/Aircraft/A380/Models/a380.rgb,v > Sticky Tag: (none) > Sticky Date: (none) > Sticky Options: -kb > > Another Linux User here. The conflicting files do appear to be CVS. data/Aircraft/A380/Textures/Livery/House$ cvs status COWLING.rgb COWLING.RGB =================================================================== File: COWLING.rgb Status: Up-to-date Working revision: 1.1 Repository revision: 1.1 /var/cvs/FlightGear-0.9/data/Aircraft/A380/Textures/Livery/House/COWLING.rgb,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: -kb =================================================================== File: COWLING.RGB Status: Up-to-date Working revision: 1.1 Repository revision: 1.1 /var/cvs/FlightGear-0.9/data/Aircraft/A380/Textures/Livery/House/COWLING.RGB,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: -kb data/Aircraft/A380/Textures/Livery/House$ ls -l total 2972 -rw-r--r-- 1 gpatterson gpatterson 513370 2005-01-22 14:10 A3802.XCF -rw-r--r-- 1 gpatterson gpatterson 329990 2008-06-03 00:02 A380.rgb -rw-r--r-- 1 gpatterson gpatterson 1297219 2005-01-22 14:10 A380.xcf -rw-r--r-- 1 gpatterson gpatterson 1568 2005-01-22 14:10 BYPASS.RGB -rw-r--r-- 1 gpatterson gpatterson 786486 2005-01-22 14:10 cowl.bmp -rw-r--r-- 1 gpatterson gpatterson 30944 2008-06-02 00:04 COWLING.rgb -rw-r--r-- 1 gpatterson gpatterson 13584 2005-01-22 14:10 COWLING.RGB -rw-r--r-- 1 gpatterson gpatterson 8932 2005-01-22 14:10 COWLING.XCF drwxr-xr-x 2 gpatterson gpatterson 4096 2008-06-03 00:02 CVS -rw-r--r-- 1 gpatterson gpatterson 608 2008-06-02 00:04 ENDPLATE.rgb -rw-r--r-- 1 gpatterson gpatterson 608 2005-01-22 14:10 ENDPLATE.RGB -rw-r--r-- 1 gpatterson gpatterson 11481 2008-06-02 00:04 Tyre.rgb Regards George
------------------------------------------------------------------------------ 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
