4

This is my current git-svn workflow:

git checkout -b feature master
# hack commit hack commit
git checkout master
git svn rebase
git merge feature
git svn dcommit

This usually works fine, git replays at the trunk all the commits from the local branch, and the only 'lost data' are the original commit's timestamps, no big deal.

But it looks like today there was something different about the merge and dcommit that caused the commit message on the SVN repo to be simply "Merge branch 'feature'", maybe because the feature was 'smaller', with only 2 or 3 commits.

How can I avoid this to happen and ensure that all commits and commit messages from git are replayed on the SVN repo?

dipnlik
  • 378
  • 4
  • 13

2 Answers2

1

That comment should be the result of a dcommit of a git merge, as illustrated in "Is git-svn dcommit after merging in git dangerous?":

(master)$> git log --graph --oneline --decorate
* 56a779b (work, master) Merge branch 'work'
|\  
| * af6f7ae msg 3
| * 8750643 msg 2
| * 08464ae msg 1
|/  
* 21e20fa (git-svn) last svn commit

In other words, if those three "msgx" commits had been done directly on master, they would have been replayed (with their original comments) on the svn side.
But here, only the resulting merge commit gets replayed, with the "generic" comment on it.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • Ok, I think I got it, but it still doesn't answer how can I merge the feature into master ensuring that master will receive all the commits instead of a combined 'merge branch' commit. Should I rebase from feature to master instead of merge? – dipnlik Aug 30 '11 at 17:12
  • 1
    @dipnlik: if you want to replay all commits from `feature` to `master`, then yes, rebase is an option (provided you know about the risks about rebasing a branch that you might have already pushed to other remote Git repo and that other mights already have cloned, risks which have nothing to do with git-svn: see "[RECOVERING FROM UPSTREAM REBASE](http://kernel.org/pub/software/scm/git/docs/git-rebase.html#_recovering_from_upstream_rebase)" – VonC Aug 30 '11 at 18:19
0

You will need to rebase from the feature branch first:

git checkout feature
git rebase master

This ensures that when you merge into your master, you only get a Fast-Forward rather than an actual merge.

My flow is usually more like this:

git checkout master
git svn rebase
git checkout feature
<hack...hack...hack>
git commit
git rebase master
git checkout master
git merge feature

I just make sure to do an svn rebase and then rebase all my feature branches to keep everything nice and linear the way that SVN likes it.

Also, if you're not aware of it, there is the git svn dcommit --dry-run option. I always use --dry-run and count the number of commits to make sure that git-svn is going to commit what I expect.

shadowland
  • 757
  • 1
  • 6
  • 20