Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Hi, Another problem. After update and several commits to the file ZIOP.H,v it gets corrupted. The file version 1.1.2.7 is inserted twice and I got the following: cvs server: warning: duplicate key `log' in version `1.1.2.7' of RCS file `/sat1703/SAT1703_BETA/ZIO/P/CODE/ZIOP.H,v' Here is the RCS file: ==================================================== head 1.1; access; symbols AX_PE_IMPORT:1.1.0.2; locks; strict; comment @ * @; 1.1 date 2005.08.30.10.57.26; author VIE_MUE; state dead; branches 1.1.2.1; next ; deltatype text; kopt kv; permissions 666; commitid ce443143b934975; filename ZIOP.H; 1.1.2.1 date 2005.08.30.10.57.26; author VIE_MUE; state Exp; branches; next 1.1.2.2; deltatype text; kopt kv; permissions 444; commitid ce443143b934975; filename ZIOP.H; 1.1.2.2 date 2005.09.07.10.52.51; author vie_scre; state Exp; branches; next 1.1.2.3; deltatype text; kopt kv; permissions 666; commitid 330431ec682370a; filename ZIOP.H; 1.1.2.3 date 2005.09.07.11.12.00; author vie_scre; state Exp; branches; next 1.1.2.4; deltatype text; kopt kv; permissions 666; commitid e48431ecaff45b2; filename ZIOP.H; 1.1.2.4 date 2005.09.07.11.21.32; author vie_scre; state Exp; branches; next 1.1.2.5; deltatype text; kopt kv; permissions 666; commitid f1c431ecd3b4cfe; filename ZIOP.H; 1.1.2.5 date 2005.09.08.07.57.16; author vie_scre; state Exp; branches; next 1.1.2.6; deltatype text; kopt kv; permissions 666; commitid 814431feeda7ec6; filename ZIOP.H; 1.1.2.6 date 2005.09.08.08.13.33; author vie_scre; state Exp; branches; next 1.1.2.7; deltatype text; kopt kv; permissions 666; commitid 5a8431ff2ac0b40; filename ZIOP.H; 1.1.2.7 date 2005.10.10.13.38.12; author vie_scre; state Exp; branches; next ; deltatype text; kopt kv; permissions 666; commitid eac434a6ec347fc; filename ZIOP.H; desc @@ 1.1 log @file ZIOP.H was initially added on branch AX_PE_IMPORT. @ text @@ 1.1.2.1 log @Ersteingabe @ text @a0 18 #include <CPU.H> #include <AX1703.H> #include <AK1703.H> #include <AXPBUS.H> #include <ZDTP.H> #include <ZIOXBP.H> #include <8032P.H> #include <\ZIO\CODE\ZIOD.H> /* #define Anweisungen */ #include <\ZIO\CODE\ZIOT.H> /* typedef Anweisungen */ #include <\ZIO\CODE\ZIOV.H> /* alle Externvariablen */ #include <\ZIO\CODE\ZIOF.H> /* alle Prototypdefinitionen */ #include <ZIOPD.H> /* #define Anweisungen */ #include <ZIOPT.H> /* typedef Anweisungen */ #include <ZIOPV.H> /* Definition von Variablen dieser Funktionsgruppe */ #include <ZIOPF.H> /* Prototypdefinitionen dieser Funktionsgruppe */ @ 1.1.2.2 log @Includes korrigiert (Erstimport war eine Leiche - Sourcen aus Jahr 97) @ text @d2 1 d4 14 a18 8 #include <\ZIO\CODE\ZIOD.H> /* #define Anweisungen */ #include <\ZIO\CODE\ZIOT.H> /* typedef Anweisungen */ #include <\ZIO\CODE\ZIOV.H> /* alle Externvariablen */ #include <\ZIO\CODE\ZIOF.H> /* alle Prototypdefinitionen */ #include <ZIOPD.H> /* #define Anweisungen */ #include <ZIOPT.H> /* typedef Anweisungen */ #include <ZIOPV.H> /* alle Externvariablen des ZDT Subsystems */ #include <ZIOPF.H> /* alle Prototypdefinitionen */ @ 1.1.2.3 log @H-Files aus ZIO\80251\CODE auch inkludieren @ text @d4 8 a11 12 #include <\ZIO\CODE\ZIOD.H> #include <\ZIO\CODE\ZIOT.H> #include <\ZIO\CODE\ZIOV.H> #include <\ZIO\CODE\ZIOF.H> #include <\ZIO\80251\CODE\80251D.H> #include <\ZIO\80251\CODE\80251T.H> #include <\ZIO\80251\CODE\80251F.H> #include <\ZIO\80251\CODE\80251V.H> #include <ZIOPD.H> #include <ZIOPT.H> #include <ZIOPV.H> #include <ZIOPF.H> @ 1.1.2.4 log @REG251S.H wird inkludiert (benoetigt ZIOHWINI.C) @ text @a3 2 #include <REG251S.H> @ 1.1.2.5 log @Inhalte von den H-Files auf 80251\CODE uerbernommen. H-Files auf 80251\CODE werden aufgeloest. @ text @d2 1 d10 4 @ 1.1.2.6 log @#include <AX1703.H> hinzugefuegt @ text @a1 1 #include <AX1703.H> @ 1.1.2.7 log @"REG251S.H" nur fuer 251-er Compiler inkludieren @ text @a3 1 #ifdef PROC251 a4 1 #endif @ 1.1.2.7 log @REG251S.H nur fuer 80251 inkludieren @ text @a3 1 #ifdef PROC251 a4 1 #endif @ ==================================================== Only the 'log' string for version 1.1.2.7 is different, but everything else is the same. We found several files with an error like this, and we are not able to work with this files (commit error) anymore. Any idea what's wrong and how to fix this ? Ernst Ernst Gill VA TECH SAT GmbH & Co Ruthnergasse 1 A-1210 Wien, Austria Phone: (+43/1) 29129 4338 Fax: (+43/1) 29 28 838 or (+43/1) 29129 4649 e-mail: ernst.gill at sat-automation.com Internet: http://www.sat-automation.com