Editing Undoing-a-commit
From BRL-CAD
Warning: You are not logged in. Your IP address will be publicly visible if you make any edits. If you log in or create an account, your edits will be attributed to your username, along with other benefits.
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
| Latest revision | Your text | ||
| Line 4: | Line 4: | ||
$ svn ci test_vls.c | $ svn ci test_vls.c | ||
| − | + | ... revision: 9999 | |
| − | |||
| − | |||
| − | We want to "uncommit" the change. | + | We want to "uncommit" the change. First get the URL of the trunk (shortened example): |
| − | + | $ svn info | |
| + | Path: . | ||
| + | URL: https://brlcad/svnroot/trunk | ||
| + | Repository Root: https://brlcad/svnroot | ||
| + | Repository UUID: 2f96ce8b-6d43-0410-b8df-bffccc660ffb | ||
| + | Revision: 9999 | ||
| + | Node Kind: directory | ||
| + | Schedule: normal | ||
| + | Last Changed Author: tom | ||
| + | Last Changed Rev: 9999 | ||
| + | Last Changed Date: 2012-05-23 15:10:33 -0500 (Wed, 23 May 2012) | ||
| − | $ svn svn merge -r9999:9998 | + | If we don't want to lose the changes we just committed, no worries. We can copy those file(s) to an unversioned directory '''before''' we do the merge steps below or extract those changes at any point in the future with the "svn diff" command. Stash the changed file(s) if desired. |
| + | |||
| + | Do the merge: | ||
| + | |||
| + | $ svn svn merge -r9999:9998 https://brlcad/svnroot/trunk | ||
U test_vls.c | U test_vls.c | ||
| − | |||
That just "merged" the commits from revision 9999 to 9998, which effectively "undoes" 9999. Check that your trunk checkout has changed back to the state before the bad commit: | That just "merged" the commits from revision 9999 to 9998, which effectively "undoes" 9999. Check that your trunk checkout has changed back to the state before the bad commit: | ||
