Dongsheng Song wrote:
After some merge operation,
git-svn doesn't support nonlinear history in any of the official releases, though there will be some support in the next release (you can try it out by grabbing the latest version from git.git's master branch). If you don't want to run a prerelease version of git, you need to avoid doing non-squash merges into branches that you are going to check into an svn repository.
Squash merges (git merge --squash) work fine, though. They will be recorded in your history as a regular commit, not a merge, so git-svn won't be confused by them.
-Steve - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
