RE: [Mks-si-to-cvs-discussion] convert-diffs.pl problem

[Yang, J. B. <jy...@at...>]

All the files fail exactly the same way. This is just an example.
I copied  macs_com.h,v. at the end of the mail.

I can view any history of the file in my IDE using CVS Proxy, just can't
diff.

So I tried to check out an old version of the project in Wincvs. I check out
based on a tag , I got:

cvs -x checkout -P -r Version-1_41 MACS (in directory
C:\CVS_test\ZZZZ_storge\Checkout2)
cvs server: Updating MACS
U MACS/Macs.dsw
cvs server: Updating MACS/Shared
U MACS/Shared/Shared.dsp
........................................
cvs server: Updating MACS/Win32/DataLogSrv
cvs server: Updating MACS/Win32/DataLogSrv/res
cvs server: Updating MACS/Win32/Database
cvs server: Dropping data: pos>vec->nlines
cvs [server aborted]: invalid change text in
/VersionControl/MACS/Win32/Database/macs_dev.mdb,v

***** CVS exited normally with code 1 *****


Remember that .mdb file, we used to have trouble with. I am not sure the
converting is correct.

Thanks.

/Judy

macs_com.h,v:
----------------------------------------------------------------
head 1.24;
branch ;
access ;
symbols Version-1_630:1.24 Version-1_623:1.22 Version-1_620:1.22
        Version-1_611:1.22 Version-1_61:1.22 Version-1_60:1.22
Version-1_5:1.21
        Version-1_5-Beta:1.21 MultiLanguage:1.20 Network-Enable:1.16
Version-1_41:1.15
        Version-1_4:1.14 Net-Protocol-Update:1.13 W_I_P_---Cmptr-Upgrd:1.12
        Hdr-Reorganization:1.10 Version-1_332:1.7;
locks ; strict;
comment @@;


1.24
date 2003.08.08.15.26.06; author jcoughlin; state Rls;
branches ;
next 1.23;

1.23
date 2003.07.28.12.30.17; author jcoughlin; state Exp;
branches ;
next 1.22;

1.22
date 2002.03.08.21.27.30; author BrianV; state Rls;
branches ;
next 1.21;

1.21
date 2001.02.01.16.51.06; author BrianV; state Rls;
branches ;
next 1.20;

1.20
date 2001.01.26.12.47.34; author BrianV; state Exp;
branches ;
next 1.19;

1.19
date 2000.12.13.15.21.38; author BrianV; state Exp;
branches ;
next 1.18;

1.18
date 2000.07.31.14.50.08; author BrianV; state Exp;
branches ;
next 1.17;

1.17
date 2000.07.12.18.59.36; author BrianV; state Exp;
branches ;
next 1.16;

1.16
date 2000.06.03.12.59.04; author BrianV; state Exp;
branches ;
next 1.15;

1.15
date 2000.04.27.12.15.58; author BrianV; state Rls;
branches ;
next 1.14;

1.14
date 2000.04.13.18.23.32; author BrianV; state Rls;
branches ;
next 1.13;

1.13
date 2000.02.01.22.39.18; author BrianV; state Exp;
branches ;
next 1.12;

1.12
date 2000.01.11.20.12.20; author brianv; state Exp;
branches ;
next 1.11;

1.11
date 1999.12.22.14.06.02; author ALBERTK; state Exp;
branches ;
next 1.10;

1.10
date 1999.12.15.21.34.58; author brianv; state Exp;
branches ;
next 1.9;

1.9
date 1999.12.01.21.37.04; author brianv; state Exp;
branches ;
next 1.8;

1.8
date 1999.11.03.17.02.06; author brianv; state Exp;
branches ;
next 1.7;

1.7
date 1999.08.06.15.03.14; author brianv; state Exp;
branches ;
next 1.6;

1.6
date 1999.04.27.11.10.00; author Brian; state Exp;
branches ;
next 1.5;

1.5
date 1999.02.19.16.38.00; author Brian; state Exp;
branches ;
next 1.4;

1.4
date 1999.02.17.08.22.00; author Brian; state Exp;
branches ;
next 1.3;

1.3
date 1999.02.16.13.58.00; author Brian; state Exp;
branches ;
next 1.2;

1.2
date 1999.02.16.10.40.00; author Brian; state Exp;
branches ;
next 1.1;

1.1
date 1999.02.16.09.10.00; author Admin; state Exp;
branches ;
next ;


desc
@@


1.24
log
@Data Table Initial Values supported@
text
@//////////////////////////////////////////////////////////////////////
//
// macs_com.h: Declarations specific to MACS (Win32 <-> QNX)
//             communications.
//
//////////////////////////////////////////////////////////////////////

#ifndef _MACS_COM_H_
#define _MACS_COM_H_

#include "macs_data.h"
#include "data_dfn.h"

#ifdef _WIN32
	// pack structures to the one-byte boundary instead of the default
	//  eight-byte boundary specified by the /Zp1 compiler option
	#pragma pack(1)	
#endif

//------------------------------------------------------------------------
//  COMMUNICATION PROTOCOL - COMMAND CODES
//------------------------------------------------------------------------

// ERROR HANDLING MESSAGES
#define X_ERROR					0

// GENERAL MESSAGES
//  These commands require a specific command as the detail
#define X_COMMUNICATION			1
#define X_INTERFACE				2

// DATA ACCESS MESSAGES
//  These commands require a specific data category as the detail
#define X_GET					10	// get single
entities
#define X_GET_RANGE				11	// get a consecutive
range of entities
#define X_GET_ALL				12	// get all entities
#define X_GET_MULTIPLE			13	// get individually
specified entities
#define X_GET_LIST				14	// get a pre-defined
list - returns segmented packets (List Type as detail)

#define X_SET					20	// get single
entities
//#define X_SET_RANGE			21	// get a consecutive range
of entities
//#define X_SET_ALL				22	// get all entities
#define X_SET_MULTIPLE			23	// get individually
specified entities
//#define X_SET_LIST			24	// get a pre-defined list -
returns segmented packets (List Type as detail)

#define X_RESET					30	// reset single
entities

// FILE HANDLING MESSAGES
//  These commands require the File Type as the detail
#define X_DOWNLOAD_FILE			40
#define X_UPLOAD_FILE			41
#define X_REMOVE_FILE			42
#define X_RENAME_FILE			43
#define X_SAVE_FILE_AS			44
#define X_DOWNLOAD_RQST			45
#define X_DOWNLOAD_RPLY			46
#define X_DOWNLOAD_GNRL			47
#define X_UPLOAD_GNRL			48
#define X_DOWNLOAD_ARCHIVE		49
#define X_UPLOAD_ARCHIVE		50

// ACTION REQUEST MESSAGES		
#define X_CHANGE_PART_TYPE		80
#define X_DEVICE_ACTION			81	// requires action type as
the detail
#define X_ACK_MSG				82
#define X_HDEVICE_ACTION		83	// requires hardware
category as the detail
#define X_HDRIVER_ACTION		84  // requires action type as the
detail
#define X_MISC_ACTION			85  // requires action type as the
detail

// MISCELLANEOUS MESSAGES	


//------------------------------------------------------------------------
//  COMMUNICATION PROTOCOL - DETAIL CODES
//------------------------------------------------------------------------

// ERROR DETAILS
#define XD_ERR_UNKNOWN_CMD			1
#define XD_ERR_UNKNOWN_DTL			2
#define XD_ERR_INVALID_SIZE			3
#define XD_ERR_INVALID_PARAMETER	4
#define XD_ERR_CHECKSUM				5
#define XD_ERR_INSUFFICIENT_MEMORY	6

// COMMUNICATION COMMAND DETAILS
#define XD_PING						1
#define XD_SHUTDOWN					2
#define XD_TEST						3

// INTERFACE COMMAND DETAILS
#define XD_REGISTER_INTERFACE		1
#define XD_UNREGISTER_INTERFACE		2
#define XD_RQST_NOTIFICATION		3
#define XD_STOP_NOTIFICATION		4
#define XD_EVENT_NOTIFICATION		5
#define XD_UNSOLICITED_EVENT_NT		6

// DATA ACCESS DETAILS (All but X_GET_ALL, X_GET_LIST and X_SET_LIST)
#define XD_VARIABLE					1
#define XD_STRING					2
#define XD_PRODUCTION_DATA			10
#define XD_DEVICE_STATUS			20	// For getting zone,
cell, program, etc. status
#define XD_HDEVICE_STATUS			21  // For Hardware Devices
#define XD_DRIVER_STATUS			22  // Future
#define XD_MOTION_STATUS			23	//
#define XD_VAR_STATUS				24  // Currently used for
obtaining initial value status (with X_GET_RANGE)
#define XD_DATA_VALUE				50  // For getting and
setting data table values

// DATA ACCESS DETAILS (X_GET_LIST and X_SET_LIST)
#define XD_DESCRIPTORS				1	// Element
Descriptors
#define XD_FILE_NAMES				2	// MACS File Names
#define XD_MC_MESSAGES				3	// Machine Hold/Wait
Messages
#define XD_MC_FAULT_HISTORY			4	// History of
Machine Holds that caused the machine to kick out of auto
#define XD_PROCESS_IDS				9	// QNX Process Id's
#define XD_HDEVICE_NAMES			10	// Hardware Device
Names

// X_MISC_ACTION DETAILS
#define XD_CONFIGURE_MOTION_CONTROLLER	1
#define XD_RESTART_MACS_CONTROLLER		2


//------------------------------------------------------------------------
//  OTHER SHARED CONSTANTS
//------------------------------------------------------------------------

// Defined Callback (Listening) Ports
// network...
#define PROG_DEV_SOCKET_PORT	2001

//  PING FLAGS
#define PNG_MACS_RUNNING		0x0001

//------------------------------------------------------------------------
//  STRUCT DECLARATIONS
//------------------------------------------------------------------------

// Building Blocks
typedef struct xAddress
{
	unsigned short	nType;
	unsigned short	nFlags;
	unsigned char	cCell;
	unsigned char	cDevice;
	unsigned short	nSpare;
	unsigned short	nAddress;
} XADDRESS;

typedef struct xRangeAddress
{
	unsigned short	nType;
	unsigned short	nFlags;
	unsigned char	cCell;
	unsigned char	cDevice;
	unsigned short	nSpare;
	unsigned short	nStartingAddress;
	unsigned short	nNumElements;
	unsigned short	nTypeSize;
} XRANGEADDRESS;

typedef struct xAddrVar
{
	XADDRESS	addr;
	XVARIANT	var;
} XADDRVAR;

// Messages
struct xFileRqst
{
	unsigned char	cCell;
	int				nFileNum;
	unsigned char	cStatus;
};

struct xGeneralFileRqst
{
	unsigned char	cCell;
	unsigned char	cStatus;
	unsigned int	nFlags;
	unsigned int	nExtra;
	char			strFileName[128];
};

struct xArchiveRqst
{
	unsigned char	cCell;
	unsigned char	cStatus;
	int				nFileNum;
	unsigned int	dwFilter;
	int				nExtra1;
	int				nExtra2;
};

typedef struct xGeneralRqst
{
	unsigned char	cCell;
	unsigned char	cParam1;
	unsigned char	cParam2;
	short			nParam1;
	short			nParam2;
} XGENERALRQST;

struct xFileRenameRqst
{
	unsigned char	cCell;
	int				nFileNum;
	char			strNewFileName[32];	// must be >=
MAX_TITLE_SIZE
	unsigned short	nLanguage;
};

struct xFileSaveAsRqst
{
	unsigned char	cSrcCell;
	unsigned char	cNewCell;
	int				nSrcFileNum;
	int				nNewFileNum;
	char			strNewFileName[32];	// must be >=
MAX_TITLE_SIZE
	int				nAttributes;
	unsigned short	nLanguage;
};

// This is the packet information needed for Data Table writes and reads
struct xDataTableValue
{
	unsigned short	nType;
	unsigned int	nFlags;
	unsigned char	nCell;
};

// This is the packet information needed for Data Table writes and reads
struct xDataTableLiveValue
{
	unsigned short	nType;
	unsigned int	nFlags;
	unsigned char	nCell;
	unsigned int	nDataTypeSize;
	unsigned int	nElements;
	char
strSymbolicRef[MAX_SYMBOLIC_REFERENCE_LENGTH];
};

// This is the packet information needed for Data Table writes and reads
struct xDataTableSetInitValue
{
	unsigned short	nType;
	unsigned int	nFlags;
	unsigned char	nCell;
	unsigned int	nPartType;
	char
strSymbolicRef[MAX_SYMBOLIC_REFERENCE_LENGTH];
	char
strInitialValue[DATA_MAX_INLINE_XFER_LENGTH];
};

struct xDataTableGetInitValue
{
	unsigned short	nType;
	unsigned int	nFlags;
	unsigned char	nCell;
	unsigned int	nPartType;
	char
strSymbolicRef[MAX_SYMBOLIC_REFERENCE_LENGTH];
};

struct xDataTableGetAllInitValues
{
	unsigned short	nType;
	unsigned int	nFlags;
	unsigned char	nCell;
	unsigned int	nPartType;
	char			strTableName[MAX_SYMBOLIC_REFERENCE_LENGTH];
};

//------------------------------------------------------------------------
//  FUNCTION DECLARATIONS
//------------------------------------------------------------------------
void htonv(XVARIANT *pVar, int nNumVars);
void ntohv(XVARIANT *pVar, int nNumVars);

//------------------------------------------------------------------------

#ifdef _WIN32
	// restore structure packing to compiler default
	#pragma pack()
#endif

#endif@


1.23
log
@Data Tables - ongoing
Added support for LIVE VALUES@
text
@d227 8
d238 29
@


1.22
log
@Moved variant structures to macs_data.h@
text
@d12 1
d107 1
d221 10
@


1.21
log
@Added XD_VAR_STATUS detail for obtaining Initial Value status (absence /
presence in file)@
text
@d11 2
a123 13
// Variant Types
#ifndef VT_BOOL
	#define VT_EMPTY	0		// Not specified (no value)
	#define VT_NULL		1		// Null
	#define VT_I2		2		// 2-byte signed integer
	#define VT_I4		3		// 4-byte signed integer
	#define VT_R4		4		// 4-byte real
	#define VT_R8		5		// 8-byte real
	#define VT_BSTR		8		// Binary string

	#define VT_BOOL		11		// Boolean; True = 1, False
= 0.
	#define VT_UI1		17		// Unsigned char
#endif

a156 13

typedef struct xVariant
{
	unsigned char		vt;			// data type
	union
	{
		unsigned char	bVal;		// VT_UI1 or VT_BOOL
		short			iVal;		// VT_I2
		long			lVal;		// VT_I4
		float			fltVal;		// VT_R4
		double			dblVal;		// VT_R8
	};
} XVARIANT;
@


1.20
log
@Implemented Multi-Language Support for project data@
text
@d103 1
@


1.19
log
@@
text
@d227 2
a228 1
	char			strNewFileName[32];
d237 1
a237 1
	char			strNewFileName[32];
d239 1
@


1.18
log
@Added constants to allow for acquiring the Macs Process Ids and for
restarting MACS.@
text
@a10 2
#include "macs_data.h"

@


1.17
log
@Defined a structure for requesting a cell archive download@
text
@d111 1
d116 1
@


1.16
log
@Added commands and details for enabling the network for the program
developer@
text
@d204 10
@


1.15
log
@Added a constant X_DOWNLOAD_REPLY.@
text
@d58 2
d66 2
d113 4
a137 1
//------------------------------------------------------------------------
a138 1
//------------------------------------------------------------------------
@


1.14
log
@Added XD_MC_FAULT_HISTORY for acquiring last fault list@
text
@d55 3
a57 2
#define X_DOWNLOAD_GNRL			46
#define X_UPLOAD_GNRL			47
@


1.13
log
@Re-vamped message codes and details.@
text
@d105 1
@


1.12
log
@Work In Progress - Checked in for computer upgrade
@
text
@d34 1
a34 1
//#define X_GET_RANGE			11	// get a consecutive range
of entities
d36 1
a36 1
//#define X_GET_MULTIPLE		13	// get individually
specified entities
d42 1
a42 1
//#define X_SET_MULTIPLE		23	// get individually
specified entities
d62 1
d71 8
d97 1
a97 1
#define XD_HARDWARE_STATUS			21  // Future (Hardware
Devices)
d102 4
a105 4
#define XD_VARIABLE_NAMES			1	
#define XD_FILE_NAMES				2
#define XD_MC_MESSAGES				3
#define XD_HDWR_DVC_NAMES			10
d129 5
d138 1
a138 1
struct xAddress
d146 1
a146 1
};
d148 1
a148 1
struct xRangeAddress
d157 2
a158 1
};
d160 1
a160 1
struct xVariant
d171 1
a171 1
};
d173 1
a173 1
struct xAddrValue
d175 3
a177 3
	struct xAddress	addr;
	struct xVariant	value;
};
a178 1

d196 1
a196 1
struct xGeneralRqst
d199 2
d203 1
a203 1
};
d226 2
a227 2
void htonv(struct xVariant *pVar, int nNumVars);
void ntohv(struct xVariant *pVar, int nNumVars);
@


1.11
log
@Visual Basic parameters can be configured to update initial values for all
part types.@
text
@d27 1
a27 1
//  For this request, the detail is the specific command
d29 1
d31 7
a37 6
// VARIABLE HANDLING MESSAGES
//  For these commands, the detail is bitwise
#define X_GET_VARIABLE			20
#define X_SET_VARIABLE			21
#define X_GET_STRING			22
#define X_SET_STRING			23
d39 5
a43 3
// STRUCTURED DATA REQUESTS
#define X_GET_STATUS			30
#define X_PRODUCTION_DATA		31
d45 2
a57 3
// LIST HANDLING MESSAGES
#define X_GET_LIST				60

d60 2
a61 1
#define X_DEVICE_ACTION			81	// detail is action type
a73 6
#define XD_REGISTER_INTERFACE		4
#define XD_UNREGISTER_INTERFACE		5
#define XD_RQST_NOTIFICATION		6
#define XD_STOP_NOTIFICATION		7
#define XD_EVENT_NOTIFICATION		8
#define XD_UNSOLICITED_EVENT_NT		9
d75 7
a81 2
// CONSOLE COMMAND DETAILS
#define XD_CLEAR_PRODUCTION_DATA	1
d83 8
a90 4
// VARIABLE HANDLING COMMAND DETAILS
#define XD_LIVE_VALUE				0x01
#define XD_INITIAL_VALUE			0x02
#define XD_ALL_PART_TYPES			0x04
d92 5
a96 5
// STATUS HANDLING DETAILS
// Note: these will likely become more generally used device
//   identifiers and will have to be moved to another header file
#define XD_CELL						1
#define XD_PROGRAM					2
a97 4
// PRODUCTION DATA REQUESTS
#define XD_GET						1
#define XD_CLEAR					2

d126 2
a127 2
	short			nType;
	short			nFlags;
d130 13
a142 2
	int				nSpare;
	int				nAddress;
@


1.10
log
@Part of a larger header reorganization task in which a number of shared
(Windows & QNX) header files were created and related constants moved from
local headers to the shared ones (macs_all.h, macs_data.h, macs_events.h,
macs_files.h, macs_hardware.h)@
text
@d83 1
@


1.9
log
@@
text
@d11 1
a11 3
//------------------------------------------------------------------------
//  TYPE DEFINITIONS
//------------------------------------------------------------------------
d13 5
d20 1
a20 1
//  COMMAND CODES
d24 1
a24 1
#define X_ERROR				0
d28 1
a28 2
#define X_COMMUNICATION		1
#define X_CONSOLE			2
d32 4
a35 4
#define X_GET_VARIABLE		20
#define X_SET_VARIABLE		21
#define X_GET_STRING		22
#define X_SET_STRING		23
d37 4
d43 8
a50 8
#define X_DOWNLOAD_FILE		40
#define X_UPLOAD_FILE		41
#define X_REMOVE_FILE		42
#define X_RENAME_FILE		43
#define X_SAVE_FILE_AS		44
#define X_DOWNLOAD_RQST		45
#define X_DOWNLOAD_GNRL		46
#define X_UPLOAD_GNRL		47
d53 1
a53 1
#define X_GET_LIST			60
d55 4
a59 1
#define X_CHANGE_PART_TYPE	80
d63 1
a63 1
//  DETAIL CONSTANTS
d68 8
a75 3
#define XD_REGISTER_INTERFACE		2
#define XD_SHUTDOWN					3
#define XD_TEST						4
d84 5
d90 3
a97 25
// Defined Listening Ports
// network...
#define PROG_DEV_SOCKET_PORT	2001

// Instruction Data Types
#define TP_INPUT			1
#define TP_OUTPUT			2
#define TP_SERVO_BITS		3
#define TP_FLAG_BITS		4
#define TP_INTERNAL			5
#define TP_DATAWORD			6
#define TP_FLOATWORD		7
#define TP_TIMER			8
#define TP_KEYPRESS			9
#define TP_STATUS_BITS		10
#define TP_EXTERNAL			11
#define TP_CONSTANT			12
#define TP_CUR_PART_TYPE	13

// Read-only variables
#define TP_SERVO_POS		30

// String variables
#define TP_PART_TYPE_NAME	60

d100 9
a108 9
#define VT_EMPTY	0		// Not specified (no value)
#define VT_NULL		1		// Null
#define VT_I2		2		// 2-byte signed integer
#define VT_I4		3		// 4-byte signed integer
#define VT_R4		4		// 4-byte real
#define VT_R8		5		// 8-byte real
#define VT_BSTR		8		// Binary string		
#define VT_BOOL		11		// Boolean; True = 1, False = 0.
#define VT_UI1		17		// Unsigned char
d111 4
a118 7

#ifdef _WIN32
// pack structures to the one-byte boundary instead of the default
//  eight-byte boundary specified by the /Zp1 compiler option
#pragma pack(1)	
#endif

a191 6
#ifdef _WIN32
// restore structure packing to compiler default
#pragma pack()
#endif


d197 7
@


1.8
log
@Added messages for file downloading.@
text
@d59 1
a59 1
#define XD_SET_CALLBACK				2
d61 1
d75 4
@


1.7
log
@Added htonv and ntohv functions for variant conversion between host and
network.@
text
@d42 3
d159 9
d191 1
@


1.6
log
@Added messages for string transfer.

@
text
@d4 1
a4 1
//            communications.
d6 1
d40 2
d46 2
d49 1
d85 1
d87 2
a88 2
// String Types
#define TP_PART_TYPE		60
d90 3
d101 1
d152 1
a152 1
	unsigned char	cFileNum;
d156 1
a156 1
struct xStatusRqst
d163 17
d184 7
@


1.5
log
@Added VT_EMPTY and VT_NULL to the variant constants.

@
text
@d31 2
d80 4
@


1.4
log
@Work In Progress


@
text
@d79 2
@


1.3
log
@Work In Progress

@
text
@d91 7
d144 4
a147 1

@


1.2
log
@Work In Progress


@
text
@d7 3
d19 4
a22 1
// GENERAL COMMANDS
d27 1
a27 1
// VARIABLE HANDLING COMMANDS
d32 1
a32 1
// FILE HANDLING COMMANDS
d38 1
a38 1
// LIST HANDLING COMMANDS
a41 1

d78 9
d95 1
d107 1
a107 1
		unsigned char	bVal;		// VT_UI1
d137 3
@


1.1
log
@This file will contain constant and structure declarations shared by
QNX and Windows communications tasks for communication between the two.

@
text
@d3 1
a3 1
// macsCom.h: Declarations specific to MACS (Win32 <-> QNX)
d16 6
a21 1
// VARIABLE MANIPULATION COMMANDS
d23 2
a24 2
#define X_GET_VARIABLE		1
#define X_SET_VARIABLE		2
d26 1
a26 1
// FILE MANIPULATION COMMANDS
d28 3
a30 3
#define X_DOWNLOAD_FILE		68	// 'D'
#define X_UPLOAD_FILE		85	// 'U'
#define X_REMOVE_FILE		82	// 'R'
d32 2
a33 1
// 
d36 1
d41 4
a44 3
// VARIABLE MANIPULATION COMMANDS
#define X_LIVE_VALUE		0x01
#define X_INITIAL_VALUE		0x02
d46 2
d49 6
d80 5
a84 5
	short	nType;
	BYTE	cCell;
	BYTE	cDevice;
	int		nSpare;
	int		nAddress;
d89 1
a89 1
	BYTE		vt;			// data type
d92 5
a96 5
		BYTE	bVal;		// VT_UI1
		short	iVal;		// VT_I2
		long	lVal;		// VT_I4
		float	fltVal;		// VT_R4
		double	dblVal;		// VT_R8
d110 3
a112 3
	BYTE	cCell;
	BYTE	cFileNum;
	BYTE	cStatus;
d117 3
a119 3
	BYTE	cCell;
	short	nParam1;
	short	nParam2;
@





-----Original Message-----
From: Phil Rittenhouse [mailto:Phi...@ds...] 
Sent: Monday, October 27, 2003 4:12 PM
To: Yang, Judy Bin
Cc: 'mks...@li...'
Subject: RE: [Mks-si-to-cvs-discussion] convert-diffs.pl problem

I would need to see the macs_com.h,v file.  I suspect the conversion
of the history did not work correctly.  Can you check out an
older revision of the file?   Do all files fail like this?









"Yang, Judy Bin" <jy...@at...>
27/10/2003 03:31 PM
 
        To:     "'Phil Rittenhouse'" <Phi...@ds...>
        cc:     "'mks...@li...'" 
<mks...@li...>
        Subject:        RE: [Mks-si-to-cvs-discussion] convert-diffs.pl 
problem




HI, Phil:

As I do more testing of the converted code, I think mostly they are fine. 
Just one thing I can't do. Diff command , eg, compare the version of the 
current with the one in history.  CVS returns 1. See attached file for an 
output of wincvs.

I also tried it in IDE (we use CVS pxoxy as plugin for source control).

It gives error: the file contains invalid path.

Hope you can give me some help. Can you do diff command on your converted 
code ? 

Thanks.

/Judy

 <<New Microsoft Word Document (4).doc>>