We are using git internally at MIPS now for LLVM work.
I'm assuming others are too.
What tools/workflows are people using to merge the changes back to svn for a patch?
Thanks in advance.
Reed
We are using git internally at MIPS now for LLVM work.
I'm assuming others are too.
What tools/workflows are people using to merge the changes back to svn
for a patch?Thanks in advance.
Reed
Submit the patch to llvm-commit for review (haha) and possibly a commit.
I don't understand your point, though.
In general, git-svn-based repos would be harder to live with merging.
* To track upstream (llvm.org/git/*.git/master), you may better do
"git rebase origin/master" on your working branch.
* To generate patch, don't forget to rebase onto upstream master.
- You may do "git cherry-pick" on your proposal-candidate-branch.
- You may use "git diff" "git show" git format-patch". Most of us
don't blame git-style diff (AFAIK!)
* To post your patches to *-commits, please read;
http://llvm.org/docs/GettingStarted.html#git_mirror
* When your patch would be applied to upstream, you should do "git
rebase origin/master" on your working branches.
HTH, ...Takumi
I have been using git-svn on another project, where they insisted that
patches should be proper svn diffs (the headers in git diffs differs
from svn diffs.)
I used a slightly modified version of this script to produce the svn
diffs: