I am working on a project in a subversion repository with a strict check-in policy which includes: Every commit to the trunk has to be reviewed by another developer and this must be mentioned in the commit message.
While working with git-svn I am making many incremental git check-ins that aren’t reviewed. Their git commit messages reflect this.
What’s the best way in which to use git-svn but follow the rules for the svn repository? Should I just squash all commits into a single svn commit? Can I rewrite the commit messages for each revision with the reviewer information? Could I “manually” move each individual change to the git master branch and modify the commit message of each before doing a git-svn dcommit?
You can interactively rebase your local branch against the Subversion tracking branch which provides you with an opportunity to squash and amend the commit.
Next time you dcommit, dcommit will replay your history one commit at a time and this is what will be commited to Subversion.
Assumptions:
What to do:
Your default editor will open with a list of commits in master to rebase against git-svn. You can pick, edit or squash the commit (Mix and match if desired).
After making your selection, another temporary file will open displaying commit messages for each of the commits you’re rewriting. This is where you amend the commit message.
Caveats:
You’re rewriting the history of your repository, exercise caution. It might be worthwhile experimenting with this behaviour until feel confident.