Mercurial > mplayer.hg
comparison DOCS/tech/svn-howto.txt @ 22510:76f7adafc67b
spelling/punctuation
author | diego |
---|---|
date | Mon, 12 Mar 2007 17:35:46 +0000 |
parents | 1f18970a546d |
children | 6fb4b3944764 |
comparison
equal
deleted
inserted
replaced
22509:b65e001a3e68 | 22510:76f7adafc67b |
---|---|
116 propagates your stuff to the repository. If you have made several independent | 116 propagates your stuff to the repository. If you have made several independent |
117 changes, commit them separately, not at the same time. | 117 changes, commit them separately, not at the same time. |
118 | 118 |
119 When prompted for a password, type the password you got assigned by the | 119 When prompted for a password, type the password you got assigned by the |
120 project admins. By default, Subversion caches all authentication tokens. | 120 project admins. By default, Subversion caches all authentication tokens. |
121 This behaviour can be disabled by setting both 'store-passwords' and | 121 This behavior can be disabled by setting both 'store-passwords' and |
122 'store-auth-creds' to "no" in ~/.subversion/config. You might need to remove | 122 'store-auth-creds' to "no" in ~/.subversion/config. You might need to remove |
123 previous cache files, which are located in ~/.subversion/auth, by hand. | 123 previous cache files, which are located in ~/.subversion/auth, by hand. |
124 | 124 |
125 You will be prompted for a log message in an editor, which is either specified | 125 You will be prompted for a log message in an editor, which is either specified |
126 by --editor-cmd on the command line, set in your personal configuration file | 126 by --editor-cmd on the command line, set in your personal configuration file |
157 | 157 |
158 | 158 |
159 9. Reverting broken commits | 159 9. Reverting broken commits |
160 | 160 |
161 There are 2 ways to reverse a change, they differ significantly in what they | 161 There are 2 ways to reverse a change, they differ significantly in what they |
162 do to the svn repository | 162 do to the repository. |
163 The recommit old method: | 163 The recommit old method: |
164 svn merge | 164 svn merge |
165 svn ci <file> | 165 svn ci <file> |
166 This simply changes the file(s) back to their old version localy and then | 166 This simply changes the file(s) back to their old version locally and then |
167 the change is commited as if it is a new change | 167 the change is committed as if it were a new change. |
168 The svn copy method | 168 The svn copy method |
169 svn rm <file> | 169 svn rm <file> |
170 svn ci <file> | 170 svn ci <file> |
171 svn cp -r<good revision> svn://svn.mplayerhq.hu/mplayer/trunk/[<path>/]<file> <file> | 171 svn cp -r<good revision> svn://svn.mplayerhq.hu/mplayer/trunk/[<path>/]<file> <file> |
172 svn ci <file> | 172 svn ci <file> |
173 This simply removes the file and then copies the last good version with | 173 This simply removes the file and then copies the last good version with |
174 its history over it, this method can only be used to revert the n last | 174 its history over it. This method can only be used to revert the n last |
175 commits but not to revert a bad commit in the middle of its history | 175 commits but not to revert a bad commit in the middle of its history. |
176 Neither method will change the history, checking out an old version will | 176 Neither method will change the history, checking out an old version will |
177 always return exactly that revision with all its bugs and features. The | 177 always return exactly that revision with all its bugs and features. The |
178 difference is that with the svn copy method the broken commit will not be | 178 difference is that with the svn copy method the broken commit will not be |
179 part of the directly visible history of the revisions after the reversal | 179 part of the directly visible history of the revisions after the reversal |
180 So if the change was completely broken like reindenting a file against the | 180 So if the change was completely broken like reindenting a file against the |
181 maintainers decision, or a change which mixed functional and cosmetic | 181 maintainers decision, or a change which mixed functional and cosmetic |
182 changes then it is better if it is not part of the visible history as it | 182 changes then it is better if it is not part of the visible history as it |
183 would make it hard to read, review and would also break svn annotate | 183 would make it hard to read, review and would also break svn annotate. |
184 For the example of a change which mixed functional and cosmetic parts they | 184 For the example of a change which mixed functional and cosmetic parts they |
185 should of course be committed again after the reversal but separately, so one | 185 should of course be committed again after the reversal but separately, so one |
186 change with the functional stuff and one with the cosmetics | 186 change with the functional stuff and one with the cosmetics. |
187 OTOH if the change which you want to reverse was simply buggy but not | 187 OTOH if the change which you want to reverse was simply buggy but not |
188 totally broken then it should be reversed with svn merge as otherwise | 188 totally broken then it should be reversed with svn merge as otherwise |
189 the fact that the change was bad would be hidden | 189 the fact that the change was bad would be hidden. |
190 One method to decide which reversal method is best is to ask yourself | 190 One method to decide which reversal method is best is to ask yourself |
191 if there is any value in seeing the whole bad change and its removal | 191 if there is any value in seeing the whole bad change and its removal |
192 in SVN vs. just seeing a comment that says what has been reversed while | 192 in SVN vs. just seeing a comment that says what has been reversed while |
193 the actual change does not clutter the immediately visible history and | 193 the actual change does not clutter the immediately visible history and |
194 svn annotate. | 194 svn annotate. |
244 remove functionality from the code without approval in a discussion on | 244 remove functionality from the code without approval in a discussion on |
245 the mplayer-dev-eng mailing list. | 245 the mplayer-dev-eng mailing list. |
246 | 246 |
247 | 247 |
248 5. Do not commit changes to the build system (Makefiles, configure script) | 248 5. Do not commit changes to the build system (Makefiles, configure script) |
249 which change behaviour, defaults etc, without asking first. The same | 249 which change behavior, defaults etc, without asking first. The same |
250 applies to compiler warning fixes, trivial looking fixes and to code | 250 applies to compiler warning fixes, trivial looking fixes and to code |
251 maintained by other developers. We usually have a reason for doing things | 251 maintained by other developers. We usually have a reason for doing things |
252 the way we do. Send your changes as patches to the mplayer-dev-eng mailing | 252 the way we do. Send your changes as patches to the mplayer-dev-eng mailing |
253 list, and if the code maintainers say OK, you may commit. This does not | 253 list, and if the code maintainers say OK, you may commit. This does not |
254 apply to files you wrote and/or maintain. | 254 apply to files you wrote and/or maintain. |
298 if you suspect that the change is going to be controversial. Based on past | 298 if you suspect that the change is going to be controversial. Based on past |
299 experience, these changes are likely to be controversial: | 299 experience, these changes are likely to be controversial: |
300 - feature removal, even if obsolete | 300 - feature removal, even if obsolete |
301 - changes to "special" output messages (like the "Core dumped ;)" message) | 301 - changes to "special" output messages (like the "Core dumped ;)" message) |
302 - verbosity changes from default (info) level | 302 - verbosity changes from default (info) level |
303 - changes to "historical" parts of docs and webpages | 303 - changes to "historical" parts of docs and web pages |
304 - use of internal or external libraries | 304 - use of internal or external libraries |
305 | 305 |
306 | 306 |
307 13. Try to keep important discussions and requests (also) on the | 307 13. Try to keep important discussions and requests (also) on the |
308 mplayer-dev-eng mailing list, so that all developers can benefit from them. | 308 mplayer-dev-eng mailing list, so that all developers can benefit from them. |