[LLVMdev] git-svn dcommit Question

David A. Greene greened at obbligato.org
Wed Jul 6 05:53:33 PDT 2011

Tobias Grosser <tobias at grosser.es> writes:

>> Will git-cherrypick work or is the merging process going to confuse
>> git-svn?
> To use git-svn you should always have a history without any git
> merges. Just commit after commit after commit. I do not know what kind
> of history git-cherrypick produces.

To clarify, I just need to create the branch at the point just before
the first commit to go to upstream.  Are merges in the history before
that point going to be a problem?

> I would do the cherrypicking like this:
> git checkout -b toCommit
> git rebase -i HEAD~30

Ok, I'll try something like that.

>> Remove all the unneeded commits in the upcoming window
> git svn -n dcommit // Check what would be committed
> git svn dcommit // Commit

Ok, thanks.  git-svn is a bit awkward, so thanks everyone for your help!


More information about the llvm-dev mailing list