Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Add juju-ci-tools and juju-release-tools #7350
Conversation
viswesn
and others
added some commits
Mar 20, 2017
abentley
and others
added some commits
Apr 12, 2017
nskaggs
changed the title from
Develop
to
Add juju-ci-tools and juju-release-tools
May 16, 2017
|
What method did you use to create this PR? The branch as presented does not preserve history, all the added files in the final revision are seen as new. Compare: https://github.com/nskaggs/juju/commits/d370579ac762d0f54cbcd88a8e9d328bace00eb4/Makefile |
|
@bz2 That's kind of odd. I used subtree merging to create this. You can see it did intermingle the history, and it seemed legit, hmm. |
|
Are we happy with the quasi lost history? You can see the changes, but as pointed out, you can see a file's history anymore directly. I think this is a knock on affect of the subtree merge, but maybe I could do it better. |
|
Actually, I think I can link them by committing a move. I'll try. |
|
Idea failed. I'm happy as-is though if others are. |
|
$$merge$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
nskaggs commentedMay 16, 2017
•
Edited 1 time
-
nskaggs
May 16, 2017
Description of change
This change brings in the QA and CI tests and tools that were managed as separate projects. Yay!
Note, most authors match, but in cases where they don't, it's simpler to add the associated email to the github account vs rewriting history (I fixed mine by just adding the additional email).
This diff insanely large, so in summary
lp:juju-ci-tools -> acceptancetests
lp:juju-release-tools -> releasetests
All history from the bzr repo was preserved, and the commits are intermingled now with the rest of the greater juju repository.
QA steps
No change, but we'll have to update our tooling to utilize this location and deprecate the old locations for these projects.
Documentation changes
N/A
Bug reference
N/A