www-infrastructure-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Querna <p...@querna.org>
Subject git svn & merging
Date Tue, 05 Jan 2010 01:17:36 GMT
Common use case of git, merging a remote branch:

   git remote add foo git://githubsareus.example.com/foo.git
   git pull foo
   git merge foo/master

Now, if you did a 'git svn dcommit', all of the commits done by the
remote 'foo', would be attributed to you, with no chance to edit the
log message, saying who contributed them.

It seems the only solution is to create a diff, apply the diff, and
create a new log message:
     git remote add foo git://githubsareus.example.com/foo.git
     git checkout -b foo-merge
     git merge jmoe/master
     git diff trunk  foo-merge >foo.patch
     # now apply .patch & set commit log as normal....

Is there a better way to handle this?

Specifically for libcloud, we have always used github, and still get
github pull requests from github users containing changes to libcloud.

Thanks,

Paul

Mime
View raw message