-
Notifications
You must be signed in to change notification settings - Fork 25
General project updates, Gradle build, Travis CI #24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
|
Hi @koush have you had a chance to look at this PR? Thanks. |
|
Be nice if these were broken out into related pieces:
As it is, it's a bit unwieldy. |
|
Thanks for your comment, @deprogram I just rebased my commits and this PR should be ready to merge. Travis CI build passes as well. There were several tab/spaces mixups in the commits that went into the repo after I initially submitted the PR. During the rebase I fixed these as well, and added it into 944b285 |
|
I just like cosmetic changes to be treated separately from changes to program logic. I don't mind cosmetic changes, I just don't want to be forced to accept them along with functional changes that I actually want. I also have to have QA run a pass on such an extensive set of changes. Not a big deal, but it's another reason it hasn't simply been merged. :) |
|
I rebased my commits onto the latest master, and noticed that someone force pushed to master, effectively erasing commits and screwing up my (and everybody else's) local branches (if the commits were based on one in the rewritten history). The merge conflicts were nasty. This really should never happen. Regarding your comments: What would you suggest? Do you want me to split up this PR into two or three separate pull requests? |
|
I'm entirely unsure who force pushed, but this displeases me as much as it displeases you. I'll review this change over the long weekend in its entirety. I believe there was a desire to split this out into smaller more manageable change requests so we can cherry pick the changes we want. However, just a quick glance at what is changing, I don't really see a need to split it up right now. |
|
Great, thanks for your comments and review @ctso. I replied to your comments and rebased my commits. |
This removes some duplication by moving common code to Utils.
|
There was another force push that caused rewritten history on the master branch (@ctso's commit 985f101 was deleted). This time it was pretty clear what caused it: The |
|
That sounds like gerrit doing its job. any changes that it doesn't know about will be clobbered, by design. @ctso , this is under gerrit; please be sure you push any changes through there |
|
Hmm, that sounds like a questionable design, or an unclear collaboration workflow to me. @rmcc when you say "this is under gerrit", are you implying that this is not the authoritative repository? If so, please advise how to properly contribute, in case GitHub pull requests are not the right method. Relying on someone to manually sync any changes done here to some other repo sounds like a flawed process. |
|
Yeah, that's what I mean. gerrit's copy (http://r.cyanogenmod.org) is the authoritative repository and all submissions should go through there (http://wiki.cyanogenmod.org/w/Doc:_using_gerrit). In case of conflicts, gerrit will forcepush its own copy on top of github's, which appears to be what's happening here. The wiki instructions assume the repository is part of the android manifest (and mentions the "repo" tool) which doesn't quite apply in this case. Pushing to ":refs/for/branchname" (i.e., "git push ssh://r.cyanogenmod.org:29418/cyngn/OneClickAndroid HEAD:refs/for/master") will do the same as the "repo upload" calls mentioned in that document. |
This PR contains general project maintenance related commits: