View Single Post
  #5  
Old 01-31-2002, 10:56 AM
alkrun
Sarnak
 
Join Date: Jan 2002
Posts: 66
Default

POSTING DIFF FILES

Commandline:
diff --context=0 -d -B eqemu.original/common eqemu/common

The basic format is:

diff cmd for file
*** original file name and timestamp
--- new file name and timestamp
***********
*** line # in old file ***
! original line
--- lines # in new file ---
! new line


COMMON DIRECTORY
-------------------------------------------------------------------------------
diff --context=0 -d -B eqemu.original/common/EQPacket.cpp eqemu/common/EQPacket.cpp
*** eqemu.original/common/EQPacket.cpp Wed Jan 9 01:46:12 2002
--- eqemu/common/EQPacket.cpp Thu Jan 31 15:48:14 2002
***************
*** 5 ****
! #include <iostream.h>
--- 5 ----
! #include <iostream>
***************
*** 14 ****
--- 15,16 ----
+
+ using namespace std;
diff --context=0 -d -B eqemu.original/common/EQPacketManager.cpp eqemu/common/EQPacketManager.cpp
*** eqemu.original/common/EQPacketManager.cpp Mon Jan 21 02:19:54 2002
--- eqemu/common/EQPacketManager.cpp Thu Jan 31 15:48:14 2002
***************
*** 3 ****
! #include <iostream.h>
--- 3 ----
! #include <iostream>
***************
*** 4 ****
--- 5,6 ----
+
+ using namespace std;
diff --context=0 -d -B eqemu.original/common/EQPacketManager.h eqemu/common/EQPacketManager.h
*** eqemu.original/common/EQPacketManager.h Fri Jan 4 12:11:54 2002
--- eqemu/common/EQPacketManager.h Thu Jan 31 15:48:14 2002
***************
*** 4 ****
! #include <iostream.h>
--- 4 ----
! #include <iostream>
***************
*** 13 ****
--- 14,15 ----
+
+ using namespace std;
diff --context=0 -d -B eqemu.original/common/database.cpp eqemu/common/database.cpp
*** eqemu.original/common/database.cpp Mon Jan 21 07:43:06 2002
--- eqemu/common/database.cpp Thu Jan 31 15:48:14 2002
***************
*** 1 ****
! #include <iostream.h>
--- 1 ----
! #include <iostream>
***************
*** 14 ****
--- 15,16 ----
+
+ using namespace std;
diff --context=0 -d -B eqemu.original/common/packet_dump.cpp eqemu/common/packet_dump.cpp
*** eqemu.original/common/packet_dump.cpp Mon Jan 14 13:23:54 2002
--- eqemu/common/packet_dump.cpp Thu Jan 31 15:48:14 2002
***************
*** 1,2 ****
! #include <iostream.h>
! #include <iomanip.h>
--- 1,2 ----
! #include <iostream>
! #include <iomanip>
***************
*** 5 ****
--- 6,7 ----
+
+ using namespace std;
diff --context=0 -d -B eqemu.original/common/packet_dump.h eqemu/common/packet_dump.h
*** eqemu.original/common/packet_dump.h Fri Jan 4 17:14:08 2002
--- eqemu/common/packet_dump.h Thu Jan 31 15:48:14 2002
***************
*** 4 ****
! #include <iostream.h>
--- 4 ----
! #include <iostream>
***************
*** 6 ****
--- 7,9 ----
+
+ using namespace std;
+
diff --context=0 -d -B eqemu.original/common/packet_dump_file.cpp eqemu/common/packet_dump_file.cpp
*** eqemu.original/common/packet_dump_file.cpp Mon Jan 7 19:16:34 2002
--- eqemu/common/packet_dump_file.cpp Thu Jan 31 15:58:16 2002
***************
*** 1,2 ****
! #include <iostream.h>
! #include <iomanip.h>
--- 1,2 ----
! #include <iostream>
! #include <iomanip>
***************
*** 4 ****
! #include <fstream.h>
--- 4 ----
! #include <fstream>
***************
*** 14 ****
--- 15,16 ----
+
+ using namespace std;
diff --context=0 -d -B eqemu.original/common/packet_dump_file.h eqemu/common/packet_dump_file.h
*** eqemu.original/common/packet_dump_file.h Sun Jan 6 03:27:12 2002
--- eqemu/common/packet_dump_file.h Thu Jan 31 15:58:16 2002
***************
*** 4 ****
! #include <iostream.h>
--- 4 ----
! #include <iostream>
***************
*** 5 ****
--- 6,7 ----
+
+ using namespace std;
diff --context=0 -d -B eqemu.original/common/packet_functions.cpp eqemu/common/packet_functions.cpp
*** eqemu.original/common/packet_functions.cpp Thu Jan 3 14:32:44 2002
--- eqemu/common/packet_functions.cpp Thu Jan 31 15:48:14 2002
***************
*** 1,2 ****
! #include <iostream.h>
! #include <iomanip.h>
--- 1,2 ----
! #include <iostream>
! #include <iomanip>
***************
*** 9 ****
--- 10,11 ----
+
+ using namespace std;
diff --context=0 -d -B eqemu.original/common/timer.cpp eqemu/common/timer.cpp
*** eqemu.original/common/timer.cpp Wed Jan 9 17:58:38 2002
--- eqemu/common/timer.cpp Thu Jan 31 15:48:14 2002
***************
*** 8 ****
! #include <iostream.h>
--- 8 ----
! #include <iostream>
***************
*** 10 ****
--- 11,12 ----
+
+ using namespace std;
Reply With Quote