Reverting changes

From World Wind Wiki

(Difference between revisions)
Jump to: navigation, search
Revision as of 06:09, 10 July 2005 (edit)
Nosilleg (Talk | contribs)
m (Added Cat:DD)
← Previous diff
Current revision (17:22, 4 January 2008) (edit) (undo)
Mkpl (Talk | contribs)
m (updated to svn (at last!))
 
Line 3: Line 3:
==TortoiseCVS== ==TortoiseCVS==
-# Using [http://cia.navi.cx/stats/project/worldwind/ cia], [http://sourceforge.net/mailarchive/forum.php?forum_id=44993 nasa-exp-checkins], [http://builds.worldwind.arc.nasa.gov/status/ World Wind Builds], and [http://cvs.sourceforge.net/viewcvs.py/nasa-exp/WorldWind/ SourceForge ViewCVS], figure out which files you changed and what the previous revision numbers were. If the file is SettingsBase.cs and your new revision is 1.5, you want to revert to revision 1.4.+# Using [http://cia.vc/stats/project/worldwind/ cia] and [http://nasa-exp.svn.sourceforge.net/viewvc/nasa-exp/ SourceForge SVN Browse], figure out which files you changed and what the previous revision numbers were. If the file is SettingsBase.cs and your new revision is 1.5, you want to revert to revision 1.4.
-# For each of the modified files, right-click on them and select CVS -> Revision Graph.+# For each of the modified files, right-click on them and select TortoiseSVN -> Revision Graph.
-# Right-click on the old revision number. Click Save this revision as. Save as a local file.+# Right-click on the old revision number. Click Save this revision as. Save as a local file.
-# Delete the current-CVS files from your sandbox. For example, delete SettingsBase.cs.+# Delete the current SVN files from your sandbox. For example, delete SettingsBase.cs.
-# Rename the previous revision you saved as the current-CVS filename. For example rename SettingsBase.1.4.cs to be SettingsBase.cs.+# Rename the previous revision you saved as the current SVN filename. For example rename SettingsBase.1.4.cs to be SettingsBase.cs.
# Make sure you do this with all the files you want to revert. # Make sure you do this with all the files you want to revert.
-# Commit your changes. This backs out your checkins.+# Commit your changes. This backs out your checkins.
[[Category:Dev Documentation]] [[Category:Dev Documentation]]

Current revision

So you've checked in some code that broke the build or shouldn't have gone in. How do you revert, or back out, your checkins?

[edit] TortoiseCVS

  1. Using cia and SourceForge SVN Browse, figure out which files you changed and what the previous revision numbers were. If the file is SettingsBase.cs and your new revision is 1.5, you want to revert to revision 1.4.
  2. For each of the modified files, right-click on them and select TortoiseSVN -> Revision Graph.
  3. Right-click on the old revision number. Click Save this revision as. Save as a local file.
  4. Delete the current SVN files from your sandbox. For example, delete SettingsBase.cs.
  5. Rename the previous revision you saved as the current SVN filename. For example rename SettingsBase.1.4.cs to be SettingsBase.cs.
  6. Make sure you do this with all the files you want to revert.
  7. Commit your changes. This backs out your checkins.
Personal tools