Open Stack

Greetings,

I'd pinged Jeremy and he suggested I email the infra list for help with this. Below is the beginning of the request I sent him:

> I'd like to take all of trove-integration (the repository) and
> drop it into the trove project in a directory called integration;
> much as https://review.openstack.org/#/c/384195/ does.
> 
> This commit makes one additional tweak, it puts the newly created
> integration folder in the ignore list for pep8.
> 
> I have tried my best to do this preserving git history for the
> changes in trove-integration but have run into issues (history
> below). Doug suggested that I contact infra because you have super
> powers on the repository.
> 
> Would you be able to help with this please.

Here is the rest of the request that I sent him with information about what I've already done, and where I've run into issues.

> I've created
> https://gist.github.com/amrith/3a46099ab12ee77230f0fa8d956b38fc
> 
> I'm having to rewrite the committer and author
> (https://gist.github.com/amrith/3a46099ab12ee77230f0fa8d956b38fc#file-
> gistfile1-txt-L15-L18) because I can't commit as some random person. Maybe
> there is a git super user who can do this easier and avoid the rewrite of
> author and committer?
> 
> To avoid conflicts with trove's gitignore and gitreview files during the
> import, I'm using a tree filter to drop those files in trove-integration
> (https://gist.github.com/amrith/3a46099ab12ee77230f0fa8d956b38fc#file-
> gistfile1-txt-L23)
> 
> The issue I'm having is this:
> 
> In trove-integration, there are a number of old changes with no change-
> id's and there are also merge commits.
> 
> When I attempt to pull those changes into trove, I'm having an issue
> commiting the change because git bitches at me that these old changes (in
> the history) have no change id.
> 
> The commit filter here
> (https://gist.github.com/amrith/3a46099ab12ee77230f0fa8d956b38fc#file-
> gistfile1-txt-L25-L29) is modeled on the one in
> http://git.openstack.org/cgit/openstack/oslo.tools/tree/filter_git_history
> .sh#n59 and I wanted to skip_commit on Merge Commit's and old commits with
> no change-id but try as I might, I've not been able to eliminate merge
> commits and these whacky old commits in Trove Integration that have not
> change ID's.
> 
> Can I make up change id's for these old commits? Is there a good way to do
> that?
> 
> Thoughts on how else I may get around this and just plonk all of trove-
> integration into trove/master in a directory called integration?

Thanks,

-amrith