Difference between revisions of "Undoing-a-commit"

(clarify. the change forever lives in history so it can be extracted with svn diff. merge applied to trunk checkout, not trunk itself.)
(show shorthand use of the dot for URL, add a correct svn response to 'svn ci')
 
Line 4: Line 4:
  
 
  $ svn ci test_vls.c
 
  $ svn ci test_vls.c
  ... revision: 9999
+
  Sending        test_vls.c
 +
Transmitting file data .
 +
Committed revision 9999.
  
We want to "uncommit" the change.  First get the URL of the trunk (shortened example):
+
We want to "uncommit" the change.  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.
  
$ svn info
+
Do the merge (note the dot):
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)
+
  
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.
+
  $ svn svn merge -r9999:9998 '''.'''
 +
  U test_vls.c
  
Do the merge:
 
 
$ svn svn merge -r9999:9998 https://brlcad/svnroot/trunk
 
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:

Latest revision as of 08:01, 26 May 2012

Undoing an svn commit[edit]

Sometimes one may inadvertently commit a change that was not intended or need to revert a change made by someone else because it breaks functionality. For example:

$ svn ci test_vls.c
Sending        test_vls.c
Transmitting file data .
Committed revision 9999.

We want to "uncommit" the change. 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 (note the dot):

$ svn svn merge -r9999:9998 .
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:

$ svn diff
...

Save the diffs if desired.

Commit the change (caution: this will undo local changes that were originally committed!):

$ svn commit -m "Reverting r9999 because ..."
Sending        test_vls.c
Transmitting file data .
Committed revision 10000.