On Oct 2, 2014, at 11:33 PM, Gilles Gouaillardet 
<gilles.gouaillar...@iferc.org> wrote:

> the most painful part is probably to manually retrieve the git commit id
> of a given svn commit id
> 
> git log master, and then search rxxxx
> /* each commit log has a line like :
> This commit was SVN rxxxxx
> */

I think you're suggesting "git log | grep SVN rxxx", right?

> and once you got (all) the git commits id of a given CMR, you can
> cherry-pick them, and push and issue the PR
> 
> /* i did not check whether cherry-pick automatically create/remove files */

It does.  See 
https://github.com/open-mpi/ompi/wiki/InitialGitSetup#workflow-for-cherry-pick-model
 for 2 examples using cherry pick.

That being said, this just be an additional complication for dealing with these 
final CMRs.

One suggestion: if you use "git cherry-pick ...", PLEASE use the "-x" option so 
that it records in the commit message that this commit is a cherry pick from 
the source commit on "master".

-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

Reply via email to