comparison DOCS/tech/svn-howto.txt @ 22238:2bed2e04289a

Some typo fixes in svn-howto
author reimar
date Sun, 18 Feb 2007 11:47:28 +0000
parents dc1a1ff6c7d9
children a50a835635c7
comparison
equal deleted inserted replaced
22237:21e4a2835569 22238:2bed2e04289a
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 vissible 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 completly broken like reindenting a file against the 180 So if the change was completely broken like reindenting a file against the
181 maintainers decission, or a change which mixed functional and cosmetic 181 maintainers decision, or a change which mixed functional and cosmetic
182 changes then its better if its not part of the vissible history as it 182 changes then its better if its 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 commited again after the reversal but seperatly, 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 theres any value in seeing the whole bad change and its removial 191 if theres 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 immedeatly vissible history and 193 the actual change does not clutter the immediately visible history and
194 svn annotate. 194 svn annotate.
195 If you are even just slightly uncertain how to revert something then ask on 195 If you are even just slightly uncertain how to revert something then ask on
196 the mplayer-dev mailinglist. 196 the mplayer-dev mailinglist.
197 197
198 198