 |
| |
|
|
Moderator
Berlin, Germany
|
Mar 2001
time: 23:09
| |
|
|
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
See the instructions provided at this website:
http://ctp2.darkdust.net/
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
Last edited by E on 17-05-2007 at 16:44
|
|
| |
|
|
Moderator
Berlin, Germany
|
Mar 2001
time: 23:09
| |
|
|
Revision 351
Reinserted comments from DirectX 9.0b versions of vidplay.h and vidplay.cpp into CTP2 versions of these files
modified ctp2_code/ui/aui_utils/vidplay.cpp
modified ctp2_code/ui/aui_utils/vidplay.h
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
|
|
Revision 353
Changed paths:
M /trunk/Makefile
M /trunk/doc/user
A /trunk/doc/user/Apolyton_README.txt
M /trunk/doc/user/Makefile
doc/user
- Added playtest readme (without changelog)
- Added Makefile target to create ChangeLog.txt
Makefile
- Added commands to put readme and changelog in playtest version
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
|
|
Revision 354
Changed paths:
M /trunk/Makefile
D /trunk/ctp2_program
M /trunk/doc/user/Apolyton_README.txt
ctp2_program
- Removed the (now empty) ctp2_program directory
doc/user/Apolyton_README.txt
- Put the brief changelog back into the readme and updated it to reflect recent
changes
Makefile
- Changed to stop appstr.txt being added to the playtest version
|
|
| |
|
|
Moderator
Berlin, Germany
|
Mar 2001
time: 23:09
| |
|
|
Revision 355
Corrected food, productiona and gold boni assignement from terrain goods.
modified ctp2_code/gs/world/Cell.cpp
modified ctp2_code/gs/world/UnseenCell.cpp
modified ctp2_code/gs/world/World.h
modified ctp2_code/gs/world/WrlEnv.cpp
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
|
|
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 14:20
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
|
|
A somewhat assorted revision of the things I came up against while trying to make the source compile under linux this evening.
Revision 367
Changed paths:
M /branches/linux/configure.in
M /branches/linux/ctp2_code/ctp/ctp2_enums.h
M /branches/linux/ctp2_code/gfx/spritesys/UnitActor.h
M /branches/linux/ctp2_code/gs/gameobj/AgreementTypes.h
M /branches/linux/ctp2_code/gs/gameobj/Army.h
M /branches/linux/ctp2_code/gs/gameobj/Readiness.h
M /branches/linux/ctp2_code/gs/gameobj/Regard.h
M /branches/linux/ctp2_code/gs/gameobj/Strengths.h
M /branches/linux/ctp2_code/gs/gameobj/TradeRoute.h
M /branches/linux/ctp2_code/gs/gameobj/TradeRouteData.h
M /branches/linux/ctp2_code/gs/gameobj/Unit.h
M /branches/linux/ctp2_code/gs/gameobj/UnitData.h
M /branches/linux/ctp2_code/gs/gameobj/citydata.h
M /branches/linux/ctp2_code/gs/gameobj/player.h
M /branches/linux/ctp2_code/robotcom/Agent/CityAgent.h
M /branches/linux/ctp2_code/robotcom/Top/AiMap.h
M /branches/linux/ctp2_code/ui/aui_common/aui_button.h
M /branches/linux/ctp2_code/ui/aui_common/aui_tabgroup.h
M /branches/linux/ctp2_code/ui/aui_ctp2/c3blitter.h
M /branches/linux/ctp2_code/ui/aui_ctp2/keymap.h
M /branches/linux/ctp2_code/ui/aui_utils/primitives.h
M /branches/linux/ctp2_code/ui/interface/greatlibrary.h
- Moved many enums to deal with enum forward declaration errors
- Include some Unit, Army and TradeRoute constructors only under WIN32
- Fixed some includes
- Put C3Blitter under #ifdef __AUI_USE_DIRECTX__ since base class is
- Corrected error handling in configure script when byacc missing
- Added gpdf as an alternative PDF viewer to acroread
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
|
|
Revision 368
Changed paths:
M /trunk/GNUmakefile.am
M /trunk/Makefile
M /trunk/ctp2_code/ctp/civctp.dsp
M /trunk/ctp2_code/mapgen/Crater.dsp
M /trunk/ctp2_code/mapgen/Plasma2.dsp
M /trunk/ctp2_code/mapgen/fault.dsp
M /trunk/ctp2_code/mapgen/geometric.dsp
A /trunk/doc/user/Makefile
M /trunk/doc/user/playtest/Apolyton_README.txt
M /trunk/doc/user/playtest/Makefile
- Added include paths to projects to fix missing header errors
- Updated playtest readme
- Fixed various Makefile problems
- Added commands to copy user manual to playtest
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
|
|
Revision 370
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ctp/Makefile.am
M /branches/linux/ctp2_code/ctp/civ3_main.cpp
M /branches/linux/ctp2_code/ctp/civapp.cpp
M /branches/linux/ctp2_code/ctp/display.cpp
M /branches/linux/ctp2_code/ctp/display.h
M /branches/linux/ctp2_code/gs/events/GameEventDescription.h
M /branches/linux/ctp2_code/gs/fileio/prjfile.h
M /branches/linux/ctp2_code/gs/gameobj/message.h
M /branches/linux/ctp2_code/gs/slic/SlicBuiltinEnum.h
M /branches/linux/ctp2_code/gs/slic/SlicEngine.h
M /branches/linux/ctp2_code/net/io/net_io.h
M /branches/linux/ctp2_code/os/nowin32/windows.h
M /branches/linux/ctp2_code/ui/aui_ctp2/radarmap.h
.
- Added config.cache to svn:ignore
os/nowin32/windows.h
- Added some display-related types
ctp/display.{h,cpp}
- Renamed GUID field on DisplayDevice struct to stop compiler choking
ctp/civapp.cpp
- Guarded some COM calls under #ifndef USE_COM_REPLACEMENT
- Added several alternative SDL calls to DirectX GetTickCount()
- Added linux alternative nanosleep to Sleep
ctp/civ3_main.cpp
- Changed two NULLs to 0s to suppress warnings
ctp/Makefile.am
- Added touch commands to ctp/Makefile.am to ensure modification dates on
targets are updated and so prevent make becoming confused
- Interchanged last two include directories because for some reason .../ai
wasn't being included for me (an automake bug?)
gs/gameobj/message.h
- Changed an MSC_VER to a WIN32 for consistency
gs/fileio/prjfile.h
- Added a (presumed) missing #else
gs/slic/SlicBuiltinEnum.h
- Guarded another #pragma
gs/slic/SlicEngine.h, ui/aui_ctp2/radarmap.h
- Fixed some enum references
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
|
|
Changes necessary to make the linux version compile under Windows again:
Revision 372
Changed paths:
M /branches/linux/ctp2_code/ctp/ctp2_enums.h
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/tracklen.cpp
M /branches/linux/ctp2_code/ctp/display.h
M /branches/linux/ctp2_code/gs/gameobj/Regard.h
tracklen.cpp
- Moved duplicate variable declaration
c3files.cpp
- Reverted change which had broken the CD checker
display.h
- Added standard header to describe changes in last revision
ctp2_enums.h
- Replaced inaccurate header
- Removed #includes to remove the need for more include paths in the subsiduary
projects
Regard.h
- Added missing #if
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
|
|
...and now to fix the things I just broke under linux
Revision 373
Changed paths:
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
M /branches/linux/ctp2_code/gs/database/CivilisationDB.h
M /branches/linux/ctp2_code/gs/gameobj/player.h
c3files.cpp
- Applied a different fix to the problem of the CD volume names
CivilisationDB.h, player.h
- Added #includes to make up for the removals in ctp2_enums.h in the last
revision
|
|
| |
|
|
Moderator
Berlin, Germany
|
Mar 2001
time: 23:09
| |
|
|
Revision 377
Corrected using the wrong global variablesm, if you use the preprocessor to replace symbol names you should replace at least all the non global ones. Global variables have external linkage that is a problem if you do it like here. Hopefully it fixes also unautorisized memory usage.
modified trunk/ctp2_code/gs/slic/scyaccdefs.h
modified trunk/ctp2_code/ui/ldl/ldlyaccdefs.h
Some cosmetic changes, while I was searching for the cause of the unauthorised memory usage. Like whitespace usage and comments.
modified trunk/ctp2_code/gs/gameobj/player.h
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/slic/slicif.cpp
modified trunk/ctp2_code/gs/utility/stringutils.cpp
modified trunk/ctp2_code/gs/utility/TurnCnt.cpp
modified trunk/ctp2_code/ui/interface/greatlibrary_util.cpp
|
|
| |
|
|
Emperor
England
|
Jul 2001
time: 22:09
| |
| |
|
|
