{"action":"created","issue":{"url":"https://api.github.com/repos/openshift/origin/issues/4083","labels_url":"https://api.github.com/repos/openshift/origin/issues/4083/labels{/name}","comments_url":"https://api.github.com/repos/openshift/origin/issues/4083/comments","events_url":"https://api.github.com/repos/openshift/origin/issues/4083/events","html_url":"https://github.com/openshift/origin/issues/4083","id":100104662,"number":4083,"title":"Improve the rebase process to reduce developer cost","user":{"login":"smarterclayton","id":1163175,"avatar_url":"https://avatars.githubusercontent.com/u/1163175?v=3","gravatar_id":"","url":"https://api.github.com/users/smarterclayton","html_url":"https://github.com/smarterclayton","followers_url":"https://api.github.com/users/smarterclayton/followers","following_url":"https://api.github.com/users/smarterclayton/following{/other_user}","gists_url":"https://api.github.com/users/smarterclayton/gists{/gist_id}","starred_url":"https://api.github.com/users/smarterclayton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/smarterclayton/subscriptions","organizations_url":"https://api.github.com/users/smarterclayton/orgs","repos_url":"https://api.github.com/users/smarterclayton/repos","events_url":"https://api.github.com/users/smarterclayton/events{/privacy}","received_events_url":"https://api.github.com/users/smarterclayton/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/openshift/origin/labels/area/techdebt","name":"area/techdebt","color":"006b75"},{"url":"https://api.github.com/repos/openshift/origin/labels/dependency/kubernetes","name":"dependency/kubernetes","color":"c7def8"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":6,"created_at":"2015-08-10T16:09:57Z","updated_at":"2015-08-10T17:13:32Z","closed_at":null,"body":"We currently have a fairly manual rebase process.  We have to prevent upstream commits from being accidentally dropped, which is fairly easy.  We should do what we can to automate risky/tedious parts of the process.\r\n\r\nSuggestions:\r\n\r\n* Provide tools for automatically listing all upstream commits since the last rebase, and identify which have merged into the pending Kubernetes rebase commit\r\n* Provide tools for easily creating upstream commits / down porting\r\n* Investigate moving back to having a forked Kube repo that we carry patches on\r\n* Reduce risk of UPSTREAM patches introduced prior to a rebase being reverted (merge conflicts should usually identify, but not easy)\r\n\r\n???\r\n\r\n@deads2k @liggitt @pweil- @bparees @mfojtik @ncdc"},"comment":{"url":"https://api.github.com/repos/openshift/origin/issues/comments/129529880","html_url":"https://github.com/openshift/origin/issues/4083#issuecomment-129529880","issue_url":"https://api.github.com/repos/openshift/origin/issues/4083","id":129529880,"user":{"login":"smarterclayton","id":1163175,"avatar_url":"https://avatars.githubusercontent.com/u/1163175?v=3","gravatar_id":"","url":"https://api.github.com/users/smarterclayton","html_url":"https://github.com/smarterclayton","followers_url":"https://api.github.com/users/smarterclayton/followers","following_url":"https://api.github.com/users/smarterclayton/following{/other_user}","gists_url":"https://api.github.com/users/smarterclayton/gists{/gist_id}","starred_url":"https://api.github.com/users/smarterclayton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/smarterclayton/subscriptions","organizations_url":"https://api.github.com/users/smarterclayton/orgs","repos_url":"https://api.github.com/users/smarterclayton/repos","events_url":"https://api.github.com/users/smarterclayton/events{/privacy}","received_events_url":"https://api.github.com/users/smarterclayton/received_events","type":"User","site_admin":false},"created_at":"2015-08-10T17:13:32Z","updated_at":"2015-08-10T17:13:32Z","body":"Or before you rebase we turn them into patches, and then a user has to go\nthrough them one by one and apply and delete them.\n\nOn Mon, Aug 10, 2015 at 1:11 PM, Paul Weil <notifications@github.com> wrote:\n\n> Reduce risk of UPSTREAM patches introduced prior to a rebase being\n> reverted (merge conflicts should usually identify, but not easy)\n>\n> This was/is the biggest issue for me when I'm rebasing. This occurs in\n> both the godeps and the OpenShift code and may not show up as upstreams\n> since the last rebase. Sometimes there are conflicts and sometimes not. The\n> last one that bit me didn't show until a final run of e2e-docker.\n>\n> Maybe we can inspect each dep and identify the dependencies we're carrying\n> patches for (other than Kube) and list those out as well as reconcile what\n> the last rebase PR carried in addition to upstreams since the last rebase.\n>\n> —\n> Reply to this email directly or view it on GitHub\n> <https://github.com/openshift/origin/issues/4083#issuecomment-129529025>.\n>\n\n\n\n-- \nClayton Coleman | Lead Engineer, OpenShift\n"}}