Subversion requires you to explicitly mark files (or directories) that had conflicts as resolved. The exception is for files that had conflicts. Updating and commiting works the same as with CVS with one expection. Svn co svn+ ssh://Idefix:/FPC/svn/fpc/trunk/ fpc Futher, create an enviroment variable SVN_SSH with the value plink.exe. Configure this session to auto login on idefix. Then create a new session in Putty, name it e.g. To checkout the latest stable that will make up the next release use the following command:ĭoing this with the win32 command line client is more tricky: first, get putty and install it and copy the plink.exe to the same directory as the svn client. To checkout the trunk (main development) of fpc use the following command: The CVS repository for fpc is locked to prevent new commits. To the trunk and merged to the fixes_2_0 branch. After that all changes made to CVS HEAD will be commited This way you can shorten the lines you need to typeįirst release_2_0_0 tag will be imported, branched (fixes_2_0) and tagged Svn ls svn+ ls svn+ Put the URL you need in an environment variable in your shell profile like To get a list of the directory layout the list command or its abbreviation ls can be used: Note: Don't make a mistake when typing the second url else you've to re-checkout. Svn switch -relocate svn+ ssh:///FPC/svn/logs. Where is in this case the name of the session of the svn server in Putty. Svn switch -relocate svn+ ssh://:/FPC/svn/logs. If you want to switch the URL prefix, for example change the logs repository svn+ssh to http, you can do this on windows with: On the local machine the repositories can be found with the URL Svn+ URL will be used in all examples below. The URL prefix needed to be able to commit changes is: The URL of this repository is svn+ ssh:///FPC/svn/sandbox1 Repository layoutįor the repository layout the defacto standard layout with trunk, tags and branches (virtual) directories will be used. Ī sandbox repository is setup on idefix so you can test svn if you've an idefix account. Or read _the_ svn book can be found here. This wiki page gives some example commands to use the new subversion respository. Each repository gets it's own unix user group so permissions can be easily managed.The proposed policy is to keep up always with the latest stable svn version. The SVN project is updated regularily and releases new versions, so it's necessary to have policy when to update the SVN server.After everything is setup and working, a read-only cvs mirror will be installed.In the first step only ssh based authentification will be possible.Stuff in packages/contrib which isn't maintained actively anymore is moved to the contrib repository.The long term goal is however to flatten the packages hierarchy (packages/base and packages/contrib?), work only with "build units/packages" in each directory. another packages dir: packages/contrib with contains packages which are maintained externally.The following repositories are planned:.We won't use cvs2svn to migrate but simply import the whole source into svn to have a clean start.8.1 Merging automatically created files.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |