Diego, el gnomo » problem http://blogs.gnome.org/diegoe Pisco Sour is GNOME's official cocktail Tue, 09 Aug 2011 10:59:11 +0000 en hourly 1 http://wordpress.org/?v=3.3.1 http://creativecommons.org/licenses/by-nc-sa/2.5/pe/ Saving your neck when git-svn dcommit fails http://blogs.gnome.org/diegoe/2009/03/18/saving-your-neck-when-git-svn-dcommit-fails/ http://blogs.gnome.org/diegoe/2009/03/18/saving-your-neck-when-git-svn-dcommit-fails/#comments Wed, 18 Mar 2009 02:08:49 +0000 diegoe http://blogs.gnome.org/diegoe/?p=105 Over the weekend I had to send some changes to an SVN repo. Thing is that I use git-svn to have all those XXI century benefits like local commits.

Sadly I had some problems with git-svn, concretely it failed half the way through sending my really big number of changes. The result was that I was left with uncommitted changes and missing commits after such set of changes. No need to say that I was really nervous about the state of my hard work of the week…

So after some desperate google searches and some questions to my personal GIT expert, desrt, I found this mail in google groups. I reproduce the process here:

How to save your neck when git-svn dcommit fails half through the process

  1. Open .git/logs/HEAD
  2. Look for your most recent commit (note that these commits are sorted by “unix time”, although you can also find the latest one by reading the shortlog there
  3. Confirm that the commit you found is the right one: git show
  4. git reset --hard hash from log
  5. git svn rebase
  6. git svn dcommit

This picks up where it left off, so you won’t loose anything, happy happy happy git :-) .

Hope this saved your neck like it saved mine. Other tips welcome :-) !

Update: Mike lets me know that the commands were bad written because of html entities and stuff, fixed now.

]]> http://blogs.gnome.org/diegoe/2009/03/18/saving-your-neck-when-git-svn-dcommit-fails/feed/ 3