SVN Migration: what changed
Revision 1 to 2. Removed lines have a minus sign; added lines have a plus sign.
| Old | New | Line | |
|---|---|---|---|
| 1 | 1 | ## The Plan | |
| 2 | 2 | ||
| 3 | 3 | - Repository reorganisation | |
| 4 | 4 | - We won't use cvs2svn to migrate but simply import the whole source into svn to have a clean start. | |
| 5 | 5 | - Lazarus gets its own repository. | |
| 6 | 6 | - The following repositories are planned: | |
| 7 | 7 | - fpc | |
| 8 | 8 | - fpcdocs | |
| 9 | 9 | - lazarus | |
| 10 | 10 | - contrib | |
| 11 | 11 | - fpcprojects | |
| 12 | 12 | - fpcbuild | |
| 13 | 13 | - html (web page contents) | |
| 14 | 14 | - logs | |
| 15 | 15 | - another packages dir: packages/contrib with contains packages which are maintained externally. Something like the Delphi Companion CD. 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. Making e.g. the fcl and fv a usual package as well. | |
| 16 | 16 | - Stuff in packages/contrib which isn't maintained actively anymore is moved to the contrib repository. | |
| 17 | 17 | - In the first step only ssh based authentification will be possible. | |
| 18 | 18 | - After everything is setup and working, a read-only cvs mirror will be installed. | |
| 19 | 19 | - The SVN project is updated regularily and releases new versions, so it's necessary to have policy when to update the SVN server. The proposed policy is to keep up always with the latest stable svn version. | |
| 20 | 20 | - Each repository gets it's own unix user group so permissions can be easily managed. | |
| 21 | 21 | ||
| 22 | 22 | ## Usage | |
| 23 | 23 | ||
| 24 | 24 | svn can be used very similiar to cvs. This wiki page gives some example commands to use the new subversion respository. For a complete list of commands use | |
| 25 | 25 | ||
| 26 | - | ||
| 27 | - | ||
| 26 | + | ```text | |
| 27 | + | svn help | |
| 28 | + | svn help <command> | |
| 29 | + | ``` | |
| 28 | 30 | ||
| 29 | 31 | or read _the_ svn book can be found here: <http://svnbook.red-bean.com/en/1.1/svn-book.html>. | |
| 30 | 32 | ||
| 31 | 33 | A sandbox repository is setup on idefix so you can test svn if you've an idefix account. The URL of this repository is svn+ssh://svn.freepascal.org/FPC/svn/sandbox1 | |
| 32 | 34 | ||
| 33 | 35 | ## Repository layout | |
| 34 | 36 | ||
| 35 | 37 | For the repository layout the defacto standard layout with trunk, tags and branches (virtual) directories will be used. | |
| 36 | 38 | ||
| 37 | - | ||
| 38 | - | ||
| 39 | - | ||
| 40 | - | ||
| 41 | - | ||
| 42 | - | ||
| 43 | - | ||
| 44 | - | ||
| 45 | - | ||
| 46 | - | ||
| 47 | - | ||
| 48 | - | ||
| 49 | - | ||
| 50 | - | ||
| 51 | - | ||
| 52 | - | ||
| 53 | - | ||
| 54 | - | ||
| 55 | - | ||
| 39 | + | ```text | |
| 40 | + | fpc/ | |
| 41 | + | trunk/ | |
| 42 | + | compiler/ | |
| 43 | + | rtl/ | |
| 44 | + | ... | |
| 45 | + | tags/ | |
| 46 | + | release_2_0_0/ | |
| 47 | + | compiler/ | |
| 48 | + | rtl/ | |
| 49 | + | ... | |
| 50 | + | branches/ | |
| 51 | + | fixes_2_0/ | |
| 52 | + | compiler/ | |
| 53 | + | rtl/ | |
| 54 | + | ... | |
| 55 | + | temporarydevelopment/ | |
| 56 | + | compiler/ | |
| 57 | + | rtl/ | |
| 58 | + | ... | |
| 59 | + | ``` | |
| 56 | 60 | ||
| 57 | - | ||
| 58 | - | ||
| 59 | - | ||
| 60 | - | ||
| 61 | - | ||
| 62 | - | ||
| 63 | - | ||
| 64 | - | ||
| 61 | + | ```text | |
| 62 | + | fpcdocs/ | |
| 63 | + | trunk/ | |
| 64 | + | Makefile | |
| 65 | + | *.tex | |
| 66 | + | ... | |
| 67 | + | tags/ | |
| 68 | + | release_2_0_0/ | |
| 69 | + | branches/ | |
| 70 | + | ``` | |
| 65 | 71 | ||
| 66 | - | ||
| 67 | - | ||
| 68 | - | ||
| 69 | - | ||
| 70 | - | ||
| 71 | - | ||
| 72 | - | ||
| 73 | - | ||
| 72 | + | ```text | |
| 73 | + | fpcbuild/ | |
| 74 | + | trunk/ | |
| 75 | + | Makefile | |
| 76 | + | demo | |
| 77 | + | ... | |
| 78 | + | tags/ | |
| 79 | + | release_2_0_0/ | |
| 80 | + | branches/ | |
| 81 | + | ``` | |
| 74 | 82 | ||
| 75 | - | ||
| 76 | - | ||
| 77 | - | ||
| 78 | - | ||
| 83 | + | ```text | |
| 84 | + | logs/ | |
| 85 | + | Changes.fpc | |
| 86 | + | Changes.fpcdocs | |
| 87 | + | ... | |
| 88 | + | ``` | |
| 79 | 89 | ||
| 80 | 90 | The Read-Only (anonymous) URL prefix is: | |
| 81 | 91 | ||
| 82 | - | ||
| 92 | + | ```text | |
| 93 | + | http://svn.freepascal.org/svn/ | |
| 94 | + | ``` | |
| 83 | 95 | ||
| 84 | 96 | The actual urls are | |
| 85 | 97 | ||
| 86 | - | ||
| 87 | - | ||
| 98 | + | ```text | |
| 99 | + | http://svn.freepascal.org/svn/fpc/ | |
| 100 | + | http://svn.freepascal.org/svn/lazarus/ | |
| 101 | + | ``` | |
| 88 | 102 | ||
| 89 | 103 | The URL prefix needed to be able to commit changes is: | |
| 90 | 104 | ||
| 91 | - | ||
| 105 | + | ```text | |
| 106 | + | svn+ssh://username@svn.freepascal.org/FPC/svn/ | |
| 107 | + | ``` | |
| 92 | 108 | ||
| 93 | 109 | This URL will be used in all examples below. | |
| 94 | 110 | ||
| 95 | 111 | On the local machine the repositories can be found with the URL | |
| 96 | 112 | ||
| 97 | - | ||
| 113 | + | ```text | |
| 114 | + | file:///FPC/svn | |
| 115 | + | ``` | |
| 98 | 116 | ||
| 99 | 117 | 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: | |
| 100 | 118 | ||
| 101 | - | ||
| 102 | - | ||
| 119 | + | ```text | |
| 120 | + | cd logs | |
| 121 | + | svn switch --relocate svn+ssh://svn.freepascal.org:/FPC/svn/logs http://svn.freepascal.org/svn/logs . | |
| 122 | + | ``` | |
| 103 | 123 | ||
| 104 | 124 | where svn.freepascal.org is in this case the name of the session of the svn server in Putty. | |
| 105 | 125 | ||
| 106 | 126 | On unix do: | |
| 107 | 127 | ||
| 108 | - | ||
| 109 | - | ||
| 128 | + | ```text | |
| 129 | + | cd logs | |
| 130 | + | svn switch --relocate svn+ssh://svn.freepascal.org/FPC/svn/logs http://svn.freepascal.org/svn/logs . | |
| 131 | + | ``` | |
| 110 | 132 | ||
| 111 | 133 | **Note:** Don't make a mistake when typing the second url else you've to re-checkout. | |
| 112 | 134 | ||
| 113 | 135 | To get a list of the directory layout the list command or its abbreviation ls can be used: | |
| 114 | 136 | ||
| 115 | - | ||
| 116 | - | ||
| 137 | + | ```text | |
| 138 | + | svn ls svn+ssh://username@svn.freepascal.org/FPC/svn/fpcdocs/ | |
| 139 | + | svn ls svn+ssh://username@svn.freepascal.org/FPC/svn/fpc/trunk/ | |
| 140 | + | ``` | |
| 117 | 141 | ||
| 118 | 142 | **Tip:** Put the URL you need in an environment variable in your shell profile like | |
| 119 | 143 | ||
| 120 | - | ||
| 121 | - | ||
| 122 | - | ||
| 144 | + | ```text | |
| 145 | + | export SVNROOT=svn+ssh://username@svn.freepascal.org/FPC/svn | |
| 146 | + | export SVNFPC=$SVNROOT/fpc | |
| 147 | + | export SVNFPCDOCS=$SVNROOT/fpcdocs | |
| 148 | + | ``` | |
| 123 | 149 | ||
| 124 | 150 | This way you can shorten the lines you need to type | |
| 125 | 151 | ||
| 126 | - | ||
| 127 | - | ||
| 152 | + | ```text | |
| 153 | + | svn ls $SVNFPC | |
| 154 | + | svn ls $SVNFPCDOCS | |
| 155 | + | ``` | |
| 128 | 156 | ||
| 129 | 157 | ## Migration of CVS data | |
| 130 | 158 | ||
| 131 | 159 | First release_2_0_0 tag will be imported, branched (fixes_2_0) and tagged (release_2_0_0). After that all changes made to CVS HEAD will be commited to the trunk and merged to the fixes_2_0 branch. | |
| 132 | 160 | ||
| 133 | 161 | The CVS repository for fpc is locked to prevent new commits. | |
| 134 | 162 | ||
| 135 | 163 | ## Checkout | |
| 136 | 164 | ||
| 137 | 165 | To checkout the trunk (main development) of fpc use the following command: | |
| 138 | 166 | ||
| 139 | - | ||
| 167 | + | ```text | |
| 168 | + | svn co svn+ssh://username@svn.freepascal.org/FPC/svn/fpc/trunk/ fpc | |
| 169 | + | ``` | |
| 140 | 170 | ||
| 141 | 171 | To checkout the latest stable that will make up the next release use the following command: | |
| 142 | 172 | ||
| 143 | - | ||
| 173 | + | ```text | |
| 174 | + | svn co svn+ssh://username@svn.freepascal.org/FPC/svn/fpc/branches/fixes_2_0/ fpc-2.0 | |
| 175 | + | ``` | |
| 144 | 176 | ||
| 145 | 177 | Doing 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. Then create a new session in Putty, name it e.g. Idefix. Configure this session to auto login on idefix. Futher, create an enviroment variable SVN_SSH with the value plink.exe. Then do | |
| 146 | 178 | ||
| 147 | - | ||
| 179 | + | ```text | |
| 180 | + | svn co svn+ssh://Idefix:/FPC/svn/fpc/trunk/ fpc | |
| 181 | + | ``` | |
| 148 | 182 | ||
| 149 | 183 | Example read-only checkout commands: | |
| 150 | 184 | ||
| 151 | - | ||
| 152 | - | ||
| 153 | - | ||
| 185 | + | ```text | |
| 186 | + | 2.1.x: svn co http://svn.freepascal.org/svn/fpc/trunk/ | |
| 187 | + | 2.0.x: svn co http://svn.freepascal.org/svn/fpc/branches/fixes_2_0/ | |
| 188 | + | 2.0.0: svn co http://svn.freepascal.org/svn/fpc/tags/release_2_0_0/ | |
| 189 | + | ``` | |
| 154 | 190 | ||
| 155 | 191 | ## Updating and commiting | |
| 156 | 192 | ||
| 157 | 193 | Updating and commiting works the same as with CVS with one expection. The exception is for files that had conflicts. Subversion requires you to explicitly mark files (or directories) that had conflicts as resolved. | |
| 158 | 194 | ||
| 159 | 195 | To update the current directory use the follwing command: | |
| 160 | 196 | ||
| 161 | - | ||
| 197 | + | ```text | |
| 198 | + | svn up | |
| 199 | + | ``` | |
| 162 | 200 | ||
| 163 | 201 | To only update the compiler directory use the following command: | |
| 164 | 202 | ||
| 165 | - | ||
| 203 | + | ```text | |
| 204 | + | svn up compiler | |
| 205 | + | ``` | |
| 166 | 206 | ||
| 167 | 207 | To commit your changes | |
| 168 | 208 | ||
| 169 | - | ||
| 209 | + | ```text | |
| 210 | + | svn ci | |
| 211 | + | ``` | |
| 170 | 212 | ||
| 171 | 213 | To mark a conflict as resolved: | |
| 172 | 214 | ||
| 173 | - | ||
| 215 | + | ```text | |
| 216 | + | svn resolved <file> | |
| 217 | + | ``` | |
| 174 | 218 | ||
| 175 | 219 | For committing with proper mime settings, you should enable auto-prop'ing in your svn client configuration (unix: ~/.subversion/config; Windows: %AppData%/subversion/config). Make the following settings: | |
| 176 | 220 | ||
| 177 | - | ||
| 178 | - | ||
| 179 | - | ||
| 180 | - | ||
| 181 | - | ||
| 182 | - | ||
| 183 | - | ||
| 184 | - | ||
| 185 | - | ||
| 186 | - | ||
| 187 | - | ||
| 188 | - | ||
| 189 | - | ||
| 190 | - | ||
| 191 | - | ||
| 192 | - | ||
| 193 | - | ||
| 194 | - | ||
| 195 | - | ||
| 196 | - | ||
| 197 | - | ||
| 198 | - | ||
| 199 | - | ||
| 200 | - | ||
| 201 | - | ||
| 202 | - | ||
| 203 | - | ||
| 204 | - | ||
| 205 | - | ||
| 206 | - | ||
| 207 | - | ||
| 208 | - | ||
| 209 | - | ||
| 210 | - | ||
| 211 | - | ||
| 212 | - | ||
| 213 | - | ||
| 221 | + | ``` pascal | |
| 222 | + | [miscellany] | |
| 223 | + | enable-auto-props = yes | |
| 224 | + | [auto-props] | |
| 225 | + | *.sh = svn:eol-style=native;svn:executable | |
| 226 | + | *.pp = svn:eol-style=native;svn:mime-type=text/pascal | |
| 227 | + | *.pas = svn:eol-style=native;svn:mime-type=text/pascal | |
| 228 | + | *.fpc = svn:eol-style=native;svn:mime-type=text/plain | |
| 229 | + | *.inc = svn:eol-style=native;svn:mime-type=text/plain | |
| 230 | + | *.ini = svn:eol-style=native;svn:mime-type=text/plain | |
| 231 | + | *.xml = svn:eol-style=native;svn:mime-type=text/plain | |
| 232 | + | *.tex = svn:eol-style=native;svn:mime-type=text/plain | |
| 233 | + | *.log = svn:eol-style=native;svn:mime-type=text/plain | |
| 234 | + | *.htm = svn:eol-style=native;svn:mime-type=text/plain | |
| 235 | + | *.html = svn:eol-style=native;svn:mime-type=text/plain | |
| 236 | + | *.fig = svn:eol-style=native;svn:mime-type=text/plain | |
| 237 | + | *.php = svn:eol-style=native;svn:mime-type=text/plain | |
| 238 | + | *.php3 = svn:eol-style=native;svn:mime-type=text/plain | |
| 239 | + | *.tmpl = svn:eol-style=native;svn:mime-type=text/plain | |
| 240 | + | *.fpc = svn:eol-style=native;svn:mime-type=text/plain | |
| 241 | + | *.fp = svn:eol-style=native;svn:mime-type=text/plain | |
| 242 | + | *.sql = svn:eol-style=native;svn:mime-type=text/plain | |
| 243 | + | *.txt = svn:eol-style=native;svn:mime-type=text/plain | |
| 244 | + | *.png = svn:mime-type=image/png | |
| 245 | + | *.jpg = svn:mime-type=image/jpeg | |
| 246 | + | *.gif = svn:mime-type=image/gif | |
| 247 | + | *.ico = svn:mime-type=image/ico | |
| 248 | + | *.o = svn:mime-type=application/octet-stream | |
| 249 | + | Makefile = svn:eol-style=native;svn:mime-type=text/plain | |
| 250 | + | *.lfm = svn:eol-style=native;svn:mime-type=text/plain | |
| 251 | + | *.lrs = svn:eol-style=native;svn:mime-type=text/pascal | |
| 252 | + | *.lpk = svn:eol-style=native;svn:mime-type=text/plain | |
| 253 | + | *.lpi = svn:eol-style=native;svn:mime-type=text/plain | |
| 254 | + | *.lpl = svn:eol-style=native;svn:mime-type=text/plain | |
| 255 | + | *.lpr = svn:eol-style=native;svn:mime-type=text/pascal | |
| 256 | + | *.cfg = svn:eol-style=native;svn:mime-type=text/plain | |
| 257 | + | *.rc = svn:eol-style=native;svn:mime-type=text/plain | |
| 258 | + | *.manifest = svn:eol-style=native;svn:mime-type=text/plain | |
| 259 | + | ``` | |
| 214 | 260 | ||
| 215 | 261 | The following Delphi specific types are useful when porting delphi code: | |
| 216 | 262 | ||
| 217 | - | ||
| 218 | - | ||
| 219 | - | ||
| 220 | - | ||
| 221 | - | ||
| 222 | - | ||
| 263 | + | ``` pascal | |
| 264 | + | *.bdsproj = svn:eol-style=native;svn:mime-type=text/plain | |
| 265 | + | *.dof = svn:eol-style=native;svn:mime-type=text/plain | |
| 266 | + | *.dpr = svn:eol-style=native;svn:mime-type=text/pascal | |
| 267 | + | *.dfm = svn:eol-style=native;svn:mime-type=text/plain | |
| 268 | + | *.dpk = svn:eol-style=native;svn:mime-type=text/plain | |
| 269 | + | *.bpg = svn:eol-style=native;svn:mime-type=text/plain | |
| 270 | + | ``` | |
| 223 | 271 | ||
| 224 | 272 | For adding new directories it is sometimes needed to add ignores for generated files or directories. The following textfile and script can be used to add the <svn:ignore> property recursivly | |
| 225 | 273 | ||
| 226 | - | ||
| 227 | - | ||
| 228 | - | ||
| 229 | - | ||
| 230 | - | ||
| 231 | - | ||
| 232 | - | ||
| 233 | - | ||
| 274 | + | ```text | |
| 275 | + | > cat ignore.txt | |
| 276 | + | *.bak | |
| 277 | + | *.exe | |
| 278 | + | *.ppu | |
| 279 | + | *.o | |
| 280 | + | *.s | |
| 281 | + | fpcmade.* | |
| 282 | + | units | |
| 283 | + | ``` | |
| 234 | 284 | ||
| 235 | - | ||
| 236 | - | ||
| 237 | - | ||
| 238 | - | ||
| 239 | - | ||
| 285 | + | ``` pascal | |
| 286 | + | > cat updignore.sh | |
| 287 | + | #!/bin/sh | |
| 288 | + | for f in `find . -type d | grep -v svn`; do | |
| 289 | + | svn ps svn:ignore -F ignore.txt $f | |
| 290 | + | done | |
| 291 | + | ``` | |
| 240 | 292 | ||
| 241 | 293 | ## Branching and tagging | |
| 242 | 294 | ||
| 243 | 295 | For all major development tasks a branch will be created. This is to have the trunk allways be in a buildable state to don't disturb snapshot building. Only in branch it is allowed to have code that can't be build. | |
| 244 | 296 | ||
| 245 | 297 | Branching will only be done on a complete repository. Example command to branch: | |
| 246 | 298 | ||
| 247 | - | ||
| 248 | - | ||
| 299 | + | ```text | |
| 300 | + | svn copy svn+ssh://username@svn.freepascal.org/FPC/svn/fpc/trunk/ \ | |
| 301 | + | svn+ssh://username@svn.freepascal.org/FPC/svn/fpc/branches/newdevelopment/ | |
| 302 | + | ``` | |
| 249 | 303 | ||
| 250 | 304 | Tagging works the same as branching: | |
| 251 | 305 | ||
| 252 | - | ||
| 253 | - | ||
| 306 | + | ```text | |
| 307 | + | svn copy svn+ssh://username@svn.freepascal.org/FPC/svn/fpc/trunk/ \ | |
| 308 | + | svn+ssh://username@svn.freepascal.org/FPC/svn/fpc/tags/newrelease/ | |
| 309 | + | ``` | |
| 254 | 310 | ||
| 255 | 311 | After a branch or tag created it can be checkout with the following command: | |
| 256 | 312 | ||
| 257 | - | ||
| 313 | + | ```text | |
| 314 | + | svn checkout svn+ssh://username@svn.freepascal.org/FPC/svn/fpc/branches/newdevelopment/ fpc-newdevelopment | |
| 315 | + | ``` | |
| 258 | 316 | ||
| 259 | 317 | ## Merging | |
| 260 | 318 | ||
| 261 | 319 | For the compiler the policy is that all fixes and development will be done in the trunk. Small fixes can be merged to the fixes branch directly. Big fixes and minor development changes are also allowed to be merged if the core developpers agree. | |
| 262 | 320 | ||
| 263 | 321 | For the RTL, FCL and other packages. All fixes and new development can be merged as long as it also works with the latest released compiler. | |
| 264 | 322 | ||
| 265 | 323 | #### Merging automatically created files | |
| 266 | 324 | ||
| 267 | 325 | When merging commits containing automatically created files like Makefiles or the msg*.inc files of the compiler, you usually get conflicts when merging them. To solve this you've to revert the merges of the automatically created files, recreate them and then commit everything. | |
| 268 | 326 | ||
| 269 | 327 | For a merge containing a change to Makefile.fpc the steps would be: | |
| 270 | 328 | ||
| 271 | 329 | - execute the merge with svnmerge | |
| 272 | 330 | - revert all Makefiles | |
| 273 | 331 | - regenerate the Makefiles from the mutated Makefile.fpc's with fpcmake -Tall -w | |
| 274 | 332 | - commit everything | |
| 275 | 333 | ||
| 276 | 334 | #### Merge with plain svn | |
| 277 | 335 | ||
| 278 | 336 | - On Windows use TortoiseSvn it has GUI (self-explaining) | |
| 279 | 337 | - For command-line svn, use | |
| 280 | 338 | ||
| 281 | 339 | ||
| 282 | 340 | ||
| 283 | 341 | svn \[help\] merge | |
| 284 | 342 | ||
| 285 | 343 | svn \[help\] mergeinfo | |
| 286 | 344 | ||
| 287 | 345 | When committing the merge, in case of doing a selective commit (merged files only) include directories (including top-level). They contain svn-properties about the merge status | |
| 288 | 346 | ||
| 289 | 347 | - **Always run in top level dir / specify top level dir for fixes/trunk** | |
| 290 | 348 | ||
| 291 | 349 | ||
| 292 | 350 | The root dir has a property | |
| 293 | 351 | ||
| 294 | 352 | ||
| 295 | 353 | <svn:mergeinfo> | |
| 296 | 354 | ||
| 297 | 355 | containing what was already merged. It will be modified and must be committed | |
| 298 | 356 | ||
| 299 | 357 | Using mergeinfo (which revisions have or have not been merged) | |
| 300 | 358 | ||
| 301 | 359 | Raw list of all merged rev: | |
| 302 | 360 | ||
| 303 | - | ||
| 361 | + | ```text | |
| 362 | + | svn mergeinfo trunk_dir fixes_0_9_30_dir | |
| 363 | + | ``` | |
| 304 | 364 | ||
| 305 | 365 | Raw list of all not yet merged rev | |
| 306 | 366 | ||
| 307 | - | ||
| 367 | + | ```text | |
| 368 | + | svn mergeinfo --show-revs eligible trunk_dir fixes_0_9_30_dir | |
| 369 | + | ``` | |
| 308 | 370 | ||
| 309 | 371 | On Linux, to get log for mergeinfo | |
| 310 | 372 | ||
| 311 | - | ||
| 373 | + | ```text | |
| 374 | + | svn mergeinfo --show-revs eligible trunk_dir fixes_0_9_30_dir | awk 'gsub("r", "-r ")' | xargs svn log trunk_dir | |
| 375 | + | ``` | |
| 312 | 376 | ||
| 313 | 377 | Using merge | |
| 314 | 378 | ||
| 315 | - | ||
| 379 | + | ```text | |
| 380 | + | svn merge trunk_dir fixes_0_9_30_dir -c 123[,124,128] [--force] [--dry-run] [--record-only] | |
| 381 | + | ``` | |
| 316 | 382 | ||
| 317 | 383 | -c 123 | |
| 318 | 384 | ||
| 319 | 385 | ||
| 320 | 386 | The change that made rev 123 (change between r122 and r123 / equals "-r 122:123") | |
| 321 | 387 | ||
| 322 | 388 | Use "-r 123:130" to merge changes after r123 up to (including) 130 | |
| 323 | 389 | ||
| 324 | 390 | --record-only | |
| 325 | 391 | ||
| 326 | 392 | ||
| 327 | 393 | mark as merged, without merging (block this from being merged) | |
| 328 | 394 | ||
| 329 | 395 | ## Tools | |
| 330 | 396 | ||
| 331 | 397 | Some people prefer GUItools instead of command line clients. | |
| 332 | 398 | ||
| 333 | 399 | - A good client with explorer integration for win32 is TortoiseSVN (http://tortoisesvn.tigris.org/ ). How to use it with ssh authentication can be found at <http://tortoisesvn.berlios.de/faq/index.php?action=artikel&cat=8&id=30&artlang=en>. | |
| 334 | 400 | - RapidSVN is a GUI for Windows and Linux. It can be found at <http://rapidsvn.tigris.org>. | |
| 335 | 401 | - GUI tools for Mac OS X (http://versiontracker.com): SvnX, eSvn, iSVN, Subcommander | |
| 336 | 402 | ||
| 337 | 403 | (Cygwin also has an SVN client) | |
| 338 | 404 | ||
| 339 | 405 | ## Committing over http | |
| 340 | 406 | ||
| 341 | 407 | For people behind firewalls and proxies, SVN access over HTTP was also configured: | |
| 342 | 408 | ||
| 343 | 409 | http://svn.freepascal.org/FPC/svn/<repository> | |
| 344 | 410 | ||
| 345 | 411 | When committing you will be prompted for username and passwd. | |
| 346 | 412 | ||
| 347 | 413 | Note that some HTTP proxies don't support webdav correctly, so a HTTP connection cannot be used and ssh remains the only alternative for committing. | |
| 348 | 414 | ||
| 349 | 415 | --- | |
| 350 | 416 | *From the Free Pascal wiki, page "SVN Migration", as it stood on 2014-08-11 after a change by BigChimp, out of the wiki's dump of 2024-05-26. Copyright stays with the author who wrote it, according to the old wiki's [[Licensing]] page. If you have concerns about this material, [message the admin](/wiki-contact).* | |
| 351 | 417 | Category: FPC internals | |
| 352 | 418 | Category: Lazarus internals | |
| 353 | 419 | Category: Revision control |