Comments on: Partial ‘svn dcommit’ with git

By: codequan.com » Partial ’svn dcommit’ with git

codequan.com » Partial ’svn dcommit’ with git — Tue, 26 Jan 2010 08:12:50 +0000

[...] found this nice article about how to send only a partial set of changes. Essentially the idea is to use ‘git rebase [...]

By: Fred

Fred — Sat, 02 Jan 2010 18:32:20 +0000

Thanks for your thoughts, guys. Making a temporary branch for this purpose sounds like a great idea as well — in spite of it being a little more work, at least you can’t hose your work by accidentally screwing up the rebase.

Mook: as one line in the shell to reduce the chances of me clobbering somebody else’s commit — if I understand you right, you don’t need to worry about this. Commits to SVN (and hopefully any other VCS) are atomic. If the repo has changed since you last touched it, your commit will fail, but you will never ever plaster over someone else’s commit.

By: Mook

Mook — Fri, 01 Jan 2010 06:27:51 +0000

I’ve always found it more calming to my nerves to use a temporary branch for things like this – give your current master a new branch name (typically “wip”), reset/rebase-i master to the state I want to commit, and git svn rebase && git svn dcommit (as one line in the shell to reduce the chances of me clobbering somebody else’s commit). Of course, I also normally pair it with dcommit -vn, so maybe I’m just paranoid

By: Jeremy Orem

Jeremy Orem — Thu, 31 Dec 2009 23:17:20 +0000

Nice! Also, if you just want to delete all the unwanted commits instead of marking them “edit” you can do:

git checkout -b svn_commit
git rebase -i HEAD~4 (or whatever)
(reorder the commits and delete the ones you don’t want)
git svn dcommit
git checkout master
git svn rebase
git branch -d svn_commit

By: Jeff Balogh

Jeff Balogh — Thu, 31 Dec 2009 15:38:36 +0000

Back in my remora days, I got this done by checking out HEAD~N in step 2 and then going back to master in step 4. I don’t think anything went wrong, but I was always worried about rebasing and what would happen to those future commits. dcommitting during a `rebase -i` seems like a much better idea.