 |
| |
|
|
Martin Gühmann
|
 |
Berlin, Germany
Mar 2001
time: 06:16
|
|
The PROJECT: Altered source files has hit the 500 post limit and actual its name doesn't really reflect its content, instead of altered source files it now contains revision reports.
Here is the start of the PROJECT: Altered source files thread.
And here is the end of the PROJECT: Altered source files thread.
For the first post of this thread I thought I add a small tutorial for TortoiseSVN:
It just contains the basics:
0. Getting TortoiseSVN
1. Checking out the repository
2. Updating your local copy
3. Commiting your changes
4. The log message window
0. Getting TortoiseSVN
You can get TortoiseSVN here for free.
1. Checking out the repository
First before you can check out the repository you need to ask Klaus for an account on the server, he needs a username and a password from you and you have to state that you agree to comply with the Activision license. You can use PM or email: klaus (the_odd_a_with_the_cycle_around) kaan (the_dot) dk
Note that I don't write email addresses into forums, otherwise we have to start to fight spam.  So you have to know what (the_odd_a_with_the_cycle_around) and (the_dot) are.
To obtain a working copy you need to do a checkout from a repository.
Select a directory in windows explorer where you want to place your working copy. Right click to pop up the context menu and select the command Checkout...
That brings up a dialog box, there you have to fill in two things:
I. The URL of the repository, which in our case is:
svn://ctp2.kaan.dk/ctp2/trunk
Of course you can also checkout svn://ctp2.kaan.dk/ctp2/ but this gives you a copy of all branches and tags and gives you a lot of 100 MB more than you actual need.
II. The checkout directory on your harddrive, note that this directory must be empty if it exists, if it doesn't exists it is created.
2. Updating your local copy
Occasionally you may want changes done by others to get incorporated in your local working copy. The process of getting changes from the server to your local copy is known as updating. Updating may be done on single files, a set of selected files, or recursively on entire directory hierarchies. To update, select the files and/or directories you want, right click and select Update in the explorer context menu. A window will pop up displaying the progress of the update as it runs. Changes done by others will be merged into your files, keeping any changes you may have done to the same files. The repository is not affected by an update.
The progress dialog uses colour coding to highlight different update actions
Blue
New item added to your WC.
Dark red
Redundant item deleted from your WC.
Green
Changes from repository successfully merged with your local changes.
Bright red
Changes from repository merged with local changes, resulting in conflicts which you need to resolve.
Black
All other items.
If you get any conflicts during an update (this can happen if others changed the same lines in the same file as you did and those changes don't match) then the dialog shows those conflicts in red. You can double click on these lines to start the external merge tool to resolve the conflicts.
3. Commiting your changes
Sending the changes you made to your working copy is known as committing the changes. But before you commit you have to make sure that your working copy is up to date. You can either make an Update directly. Or you can Check for Modifications first, to see which files have changed locally or on the server.
If your working copy is up to date and there are no conflicts, you are ready to commit your changes. Select any file and/or folders you want to commit and select Commit... from the context menu.
The commit dialog will show you every changed file, including added, deleted and unversioned files. If you don't want a changed file to be committed, just uncheck that file. If you want to include an unversioned file, just check that file to add it to the commit.
The commit dialog has two fields one text field at the top for the Revision comment. And a file list in the middle for the files you have added/modified/deleted.
To fill the revision message you can use the button Paste Changed file names first. This pastes the changed file names into the revision message. Now you can add your descriptions to into that box. Make sure that the first line of your message contains something descriptive as a title of your whole revision or at least the description of your first modification you mention there.
Never leave this first line empty or fill it with a file path, because TortoiseSVN uses the first line of the message as title in the log messages window.
Once this is done you can press the OK button to commit your changes.
If you copy your log message before you press OK you can post it here easily. If you forget this you can still copy it from the Log Messages window.
4. The log message window
You can access it for instance from the TortoiseSVN subcontext menu. You just have to right click on a directory under version controll and you have the three TortoiseSVN options there: SVN: Update, SVN Commit... and TortoiseSVN, use the last option to access the subcontext menu the option Show Log the option Show Log is at the top of the subcontext menu.
The Log Dialog retrieves all those log messages you have to write for each revision and shows them to you. The display is divided into 3 panes.
The top pane shows a list of revisions where changes to the file/folder have been committed. This summary includes the date and time, the person who committed the revision and the start of the log message.
Lines shown in blue indicate that something has been copied to this development line (perhaps from a branch).
The middle pane shows the full log message for the selected revision.
The bottom pane shows a list of all files and folders that were changed as part of the selected revision.
But it does much more than that - it provides context menu commands which you can use to get even more information about the project history.
To shorten this here one important feature of the bottom pane is that you can compare a file with the version of the previous revision, so you can spot all the changes very easily. To do this just right click the file you want to compare and use the Show Differences.
Well this above is only the most important part of the TortoiseSVN help I ripped off and filled with some specific details. If you want to know more then please read the TortoiseSVN help.
-Martin
|
|
| |
|
|
|
Fromafar
|
|
Revision 352 Small corrections
modified ctp2_code/ai/ctpai.cpp - moved variable inside #ifdef where it is used
modified ctp2_code/ctp/civ3_main.cpp - repaired log output containing negative memory sizes
modified ctp2_code/gs/dbgen/ctpdb.cpp - corrected misplaced #else
modified ctp2_code/gs/gameobj/ArmyData.cpp - prevented crash, removed a funny comma operator in a condition
modified ctp2_code/gs/slic/SlicFunc.h - corrected return type of CreateUnit
modified ctp2_code/ui/interface/EditQueue.cpp - repaired memory leaks
Note for ctplinuxfan: _MSC_VER for MSVC 6 is 1200. This version does support #pragma once.
|
|
| |
|
|
|
Fromafar
|
|
Revision 356 Crashes and Asserts
modified ctp2_code/gfx/spritesys/SpriteGroupList.cpp - prevented crash when loading a file
modified ctp2_code/gfx/spritesys/UnitSpriteGroup.cpp - Assert for battlefield removed
modified ctp2_code/gs/gameobj/Happy.cpp - try to prevent smoking crack Asserts
modified ctp2_code/gs/gameobj/Happy.h
modified ctp2_code/net/general/net_happy.cpp
modified ctp2_code/gs/newdb/CTPDatabase.cpp - removed unnecessary heap access
modified ctp2_code/ui/aui_common/aui_region.cpp - prevented crash
modified ctp2_code/ui/aui_ctp2/c3imageformats.cpp - report load failures
|
|
| |
|
|
|
ctplinuxfan
|
|
Revision 357
- fixed cases of included headers for cased filesystems
- changed: #include <SDL_endian.h>
---
Merged from local repository:
r358@linux3: holger | 2005-05-19 12:50:59 +0200
|
|
| |
|
|
|
ctplinuxfan
|
|
Revision 358
- Fixed quite some headers to get c3errors.cpp to compile on linux
- Big include filename case fix (part2)
- circular dependency fix for non-windows systems in gameobj/Civilisation*
- Moved CalculateHash() from aui_UI to aui_Base to unroll dependencies for
non-windows systems
- fixed size_type in tech_memory.h, added STL-delete[] for non-MSVC
Further changes:
Autotools:
- Disabled COM-Replacement on WIN32
- added libs/ includes
- added some more sources to ctp/Makefile.am (still far from complete)
- fixed wrong fileseperator definitions for win32
- added stub directx/dxmedia macros
Data:
- Added Johannes Sixt to credits.txt
Changes by Johannes Sixt:
- added windows stub definitions for non-windows systems
---
Merged from local repository:
r359@linux3: holger | 2005-05-19 23:49:49 +0200
|
|
| |
|
|
|
J Bytheway
|
 |
England
Jul 2001
time: 05:16
|
|
Revision 359
Changed paths:
M /trunk/Makefile
M /trunk/doc/README.txt
A /trunk/doc/common
A /trunk/doc/common/images (from /trunk/doc/dev/images:358)
M /trunk/doc/dev/Makefile
M /trunk/doc/dev/ctp2_dev.tex
D /trunk/doc/dev/images
M /trunk/doc/user
D /trunk/doc/user/Apolyton_README.txt
D /trunk/doc/user/Makefile
A /trunk/doc/user/manual
A /trunk/doc/user/manual/Makefile
A /trunk/doc/user/manual/include
A /trunk/doc/user/manual/include/*.tex
A /trunk/doc/user/manual/user_manual.tex
A /trunk/doc/user/playtest
A /trunk/doc/user/playtest/Apolyton_README.txt (from /trunk/doc/user/Apolyton_README.txt:358)
A /trunk/doc/user/playtest/Makefile (from /trunk/doc/user/Makefile:358)
- Added initial version of user manual
- Moved playtest documentation into its own directory
- Moved common documentation files out of doc/dev into doc/common
- Updated doc/README.txt
- Changed various Makefiles appropriately
Last edited by J Bytheway on 17-07-2005 at 19:20
|
|
| |
|
|
|
ctplinuxfan
|
|
Revision 360
r457@linux3: holger | 2005-05-22 20:14:31 +0200
- added anet 0.10 sources from http://www.kegel.com/anet/
Revision 361
r458@linux3: holger | 2005-05-22 20:56:49 +0200
- Fixed AC/AM command order
- Fixed Makefile use in GNUMakefile.am for VPATH configuration
- added stub gs/newdb/Makefile.am to make sure
gs/newdb will be created in VPATH configuration
- #pragma once guarded in #ifdef HAVE_PRAGMA_ONCE
- added rules for .cdb files to ctp/Makefile.am
- added ctp2_enums.h for gcc (lack of support for forward decls of enums)
- further header filecase fixes
- commented out ctpregistry.{h,cpp} for non-win32 systems
- commented out ddhelp.{h,cpp} for non-SDL ui builds
Changes merged by Johannes Sixt:
- added definitions of loop variables in front of loops
(according to c++ standard, names are valid within loop only)
Revision 362
Changed paths:
M /trunk
M /trunk/ctp2_code/os/linux
r459@linux3: holger | 2005-05-22 21:03:52 +0200
- Corrected svn:ignore properties
Revision 363
------------------------------------------------------------------------
r363 | ctplinuxfan | 2005-05-22 22:43:18 +0200 (Sun, 22 May 2005) | 2 lines
Changed paths:
A /branches/linux (from /trunk:362)
- created branch linux (in branches/linux)
Revision 364
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.h
M /branches/linux/ctp2_code/ctp/ctp2_utils/netconsole.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/tracklen.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/tracklen.h
M /branches/linux/ctp2_code/ctp/debugtools/debugcallstack.cpp
M /branches/linux/ctp2_code/gs/dbgen/Datum.cpp
M /branches/linux/ctp2_code/gs/gameobj/message.h
M /branches/linux/ctp2_code/gs/gameobj/player.h
r465@linux3: holger | 2005-05-22 23:00:04 +0200
- Added linux code for c3files.cpp, changed drive letter to drive number
- Fixed code generated by ctpdb
- Added linux code for tracklen.cpp, changed drive letter to drive number
- commented out debugging code in debugcallstack.cpp (this should be done
by a debugger and is to platform specific to generalize)
|
|
| |
|
|
|
ctplinuxfan
|
|
Due to hardware upgrade to AMD64 my XP doesn't boot anymore, so I created a linux branch which contains further changes on the linux port which haven't been tested on windows.
It would be great if someone can checkout svn://ctp2.kaan.dk/branches/linux from time to time and test if the code still compiles/works under windows.
If a checked out revision works, the changes of that revision can be merged to /trunk.
|
|
| |
|
|
|
ctplinuxfan
|
|
Revision 365
Changed paths:
M /branches/linux/configure.in
M /branches/linux/ctp2_code/ctp/Makefile.am
r467@linux3: holger | 2005-05-23 00:23:28 +0200
- Added executable-detection for future autotools based Makefiles for doc
- Added missing dependency for gs/newdb/EndGameObjectRecord.cpp
Revision 366
Changed paths:
MM /trunk/ctp2_code/ctp/Makefile.am
r468: holger | 2005-05-23 00:26:25 +0200
- Added missing dependency for gs/newdb/EndGameObjectRecord.cpp
|
|
| |
|
|
|
ctplinuxfan
|
|
Revision 369
r1566@linux3: holger | 2005-05-26 15:22:02 +0200
- fixed further #pragma once warnings
- added memory detection for linux in civ3_main.cpp
- fixed fontpaths for linux
- added initialization of SDL-Objects
- disable WIN32 specific code on !WIN32
- merged changes of ctp2_enums.h
- copied some aui_directx files as templates for sdl implementations
Changes by Johannes Sixt:
- Merged SDL Main-loop/Event handling from his civ_main.cpp
(further changes have to merged here)
r1567@linux3: holger | 2005-05-26 15:24:15 +0200
- added kdevelop session file to svn:ignore
|
|
| |
|
|
|
ctplinuxfan
|
|
Again too long to include files modified...
Revision 374
r1574@linux3: holger | 2005-05-27 23:53:23 +0200
- Merged in changes from /trunk
- added warnings to C{,XX}FLAGS
- added double uintnn definitions by libtiff headers
- some VC++ pragmas guarded in #ifdef _MSC_VER
- guarded some #pragma once in #ifdef HAVE_PRAGMA_ONCE
- further include case fixes
- added std:: namespace prefix for STL-code in headers
- missing // added for comments after #endif
- COM initialization turned on again for WIN32 (due to movies)
- typename aui_DirectSurface -> aui_Surface in parameters
(increase portability, DD() is also in c3_UI)
- added aui_Factory::new_Surface for implementation independent
generation of aui_Surface instances (caller must care of delete)
- fixed invalid initializations of non-pointer types with NULL
- started adding extra size attributes and getters due to missing _msize()
under other operating systems than windows
- moved loop variable definitions out of loops to get iso c++ compliant code
- changed some parameters to const type & to prevent errors when passing
objects
- added aui_Surface::Blank(const uint32 &color) to fill a surface with color
- improved portability of pathnames
- replaced _stricoll with stricmp calls (one implementation is enough)
- added missing enum symbols to switches (just to reduce compiler warnings)
- fixed lazy handling of some non-const c cbr-datatypes passed to
const parameters
- added missing enumerations in GameOver.h:
GAME_OVER_LOST_OVERRUN_BY_SMURFS, GAME_OVER_WON_WORMHOLE
- template typename fixes
- resolved and removed some forward declarations
- renamed IUnknown to ICTP2Unknown
- added missing IC3CivArchive::IsStoring() for COM_REPLACEMENT
- made some destructors of virtual classes virtual
- changed some variables and attributes storing sizes to datatype size_t
Changes merged in by Johannes Sixt sources:
- inline _asm code translated to C++ code
- Event system fixes (type punned pointers unsupported on gcc)
i.e. especially GameEventManager, GameEventArgument and others
- added functions and prototype definitions to windows.h
|
|
| |
|
|
|
ctplinuxfan
|
|
Remark on branch
/branches/linux:
Note, that aui_stuff should not compile under windows. The aui_direct* classes need to be reimplemented to exchange directx instances themselves, but not with the remainder of the code.
|
|
| |
|
|
|
ctplinuxfan
|
|
Revision 375
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/gfx/spritesys/directoractions.h
r1576@linux3: holger | 2005-05-28 00:11:08 +0200
- GAME_OVER enum fix
|
|
| |
|
|
|
ctplinuxfan
|
|
Small patch of another 100 files, here we go...
Revision 376
Changed paths:
M /branches/linux
r1578@linux3: holger | 2005-05-28 20:19:17 +0200
- deleted Makefile for non-gnu $(MAKE) portability
- deleted GNUmakefile.am for non-gnu $(MAKE) portability
- further filename fixes
- new target: libgsnewdb.la, so Makefile.am can be autogenerated by
ctpdb in future
- added hopefully all needed .cpp sources to ctp/Makefile.am
- further porting of win32 related code
- fixed still some const instances for const return types
- fixed some references where const references should be used
- further pathnames portability fixes
- wrong argument datatypes fixed
Changes merged by Johannes Sixt sources:
- GameEvent system non-POD arg fixes
- stub prototype for _fullpath
r1579@linux3: holger | 2005-05-28 22:34:57 +0200
- moved Makefile.am to GNUmakefile.am again
- pragma once fixes in 2 headers
- #include in windows.h
- svn:ignore properties fixed
[Edit]: Makefile and GNUmakefile.am reverted in my local r1579, so effectively nothing has changed
|
|
| |
|
|
|
ctplinuxfan
|
|
Revision 379
Changed paths:
M /branches/linux
r1582@linux3: holger | 2005-05-29 16:10:45 +0200
- Merging changes by Martin Gühmann: r377@ctp2.kaan.dk/ctp2/trunk
r1585@linux3: holger | 2005-05-30 20:55:39 +0200
- Guarded some VC++ related pragmas
- fixed datatype of arguments to uLong for zlib calls
- added SDL_thread code
- interface methods in IC3CivArchive fixed to public
- fixed some temporary instance problems by creating a new object instance
in these blocks
- fixed datatype of size arguments to size_t
- added DBL_MAX define
- Fixed filecases in ctp/Makefile.am
- simplified gs/newdb/Makefile.am
- removed L postfix of arguments to std::max/std::min template, so
no compiler errors occur when u* datatype isn't long
- moved further loop variable declarations out of loop body
- added code in aui_Mouse
- commented out code in aui_Movie for !SDL
- commented out code in aui_Redbook for !SDL, need to revert changes
in ctp2_utils first
- commented out 8bit palette code in aui_Pixel (we use 16 bit)
Changes merged from Johannes Sixt sources:
- LOWORD and HIWORD macros
- prototype additions in windows.h
- SetFocus() replacement: Global windows instance g_winFocus
(definition must be added somewhere, later)
- use memcpy in aui_Blitter instead of asm code
- commented out aui_Font code completly for !SDL
|
|
| |
|
|
|
Fromafar
|
|
Revision 381 Crash preventions + linux branch synchronisation
All files are from ctp2_code\gfx\tilesys:
modified BaseTile.h - revision 374 from linux branch
modified maputils.h - revision 374 from linux branch
modified tiledmap.cpp - crash preventions on game startup and exit, linux branch changes
modified tiledmap.h - partial application of linux branch changes
modified tiledraw.cpp - partial application of linux branch changes
modified TileDrawRoad.h - revision 374 from linux branch
modified TileInfo.h - revision 374 from linux branch
modified tileset.cpp - revision 374 from linux branch
modified tileset.h - revision 374 from linux branch
modified tileutils.cpp - linux changes
modified workmap.h - linux changes
|
|
| |
|
|
|
Fromafar
|
|
Revision 382 Crash prevention, more linux branch synchronisation
modified ctp2_code/ai/strategy/scheduler/Goal_And_Squad_Types.h - linux branch synchronisation
modified ctp2_code/ai/strategy/scheduler/Plan.cpp - crash prevention, clean up
modified ctp2_code/ai/strategy/scheduler/Plan.h - clean up
modified ctp2_code/ai/strategy/scheduler/scheduler_types.h - linux branch synchronisation
modified ctp2_code/ai/strategy/squads/Squad.h - linux branch synchronisation
modified ctp2_code/ai/strategy/squads/squad_Strength.h - linux branch synchronisation
modified ctp2_code/gfx/tilesys/resourcemap.h - corrected compiler complaint
|
|
| |
|
|
|
Fromafar
|
|
Revision 383 Memory cleanup + linux branch synchronisation
modified ctp2_code/ai/CityManagement/governor.cpp - added cleanup function
modified ctp2_code/ai/CityManagement/governor.h - added cleanup function, structure
modified ctp2_code/ai/ctp2/ctp_types.h - linux synchronisation
modified ctp2_code/ai/ctpai.cpp - scheduler and governor cleanup
modified ctp2_code/ai/ctpai.h - linux synchronisation
modified ctp2_code/ai/diplomacy/AgreementMatrix.h - linux synchronisation
modified ctp2_code/ai/diplomacy/Diplomat.h - linux synchronisation
modified ctp2_code/ai/diplomacy/diplomattypes.h - linux synchronisation
modified ctp2_code/ai/diplomacy/Foreigner.h - linux synchronisation
modified ctp2_code/ai/diplomacy/ProposalAnalysis.h - linux synchronisation
modified ctp2_code/ai/strategy/scheduler/scheduler.cpp - added cleanup function
modified ctp2_code/ai/strategy/scheduler/Scheduler.h - added cleanup function
modified ctp2_code/gs/gameobj/Player.cpp - structure, partial linux synchronisation
modified ctp2_code/gs/gameobj/player.h - structure, partial linux synchronisation
|
|
| |
|
| |
All times are GMT. The time now is 05:16.
Apolyton Time is 00:16. |
top of page
|
|
|
Forum Rules:
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts
|
HTML code is ON
vB code is ON
Smilies are ON
[IMG] code is ON
|
|
|
|
|
|
15-05-2005 21:12
|