[LLVMdev] svn mirror git?

dag at cray.com dag at cray.com
Fri Nov 16 14:30:03 PST 2012


Greg Fitzgerald <garious at gmail.com> writes:

> In my humble opinion, there is a one biggest problem with git-svn and
> svn.  It requires the maintainer to rebase before committing, and in
> git, this changes the the patch's unique ID.

I didn't totally follow your argument so I'm sure I missed something.

However, I don't think rebase is really the issue here.  Linux kernel
developers rebase all the time.  It's required before merging to
mainline.  Of course at the point of the merge your feature branch
should go away so the rebase is moot.

I _think_ the "rebase" problem you describe is more to do with an
innappropriate use of git - keeping branches around through multiple
merges.  I totally understand the attraction of doing that but with a
rebase policy (common in the git world) it's going to cause issues of
the type your described.  Still, the merge often works just fine even in
the presence of the rebase - git is often smart enough to recognize when
a commit is already applied locally.

The git-svn argument has been settled a while ago, so best not to stir
that pot right now.  But moving to git should _not_ mean we drop linear
history.  There is no reason it must.

                          -David



More information about the llvm-dev mailing list