[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: Rebase helper



Nevermind, I got rerere working, so subsequent upstreams will remember
any previous merges and apply them automatically.  Also, Git is kind
of awesome...

On Sat, Oct 3, 2015 at 9:52 PM, Clayton Coleman <ccoleman redhat com> wrote:
> https://github.com/openshift/origin/pull/4932 adds a cherry-pick
> script to assist in grabbing upstream PRs.  See HACKING.md for more
> info as well as what you need to setup to enable it.
>
> Once you have it, it'll allow you to automate a lot of the annoying
> parts of cherry-picking.  You'll still have to resolve conflicts, but
> it'll do a 3-way merge for other stuff.  Be sure to verify everything
> compiles afterwards.  Also, you unfortunately can't use rerere to make
> subsequent runs easy (not sure how to get that integrated, help
> appreciated).
>
> $ hack/cherry-pick.sh 13885
> remote: Counting objects: 5, done.
> remote: Total 5 (delta 1), reused 1 (delta 1), pack-reused 3
> Unpacking objects: 100% (5/5), done.
> From https://github.com/kubernetes/kubernetes
>    6ff8106..983a968  release-1.1 -> origin/release-1.1
> ++ Rebasing f92ee71029ef05f0d64bda72891d653fd674b872...8c7898e9a479ab3fce20d8c4071ba962e5df7483
> onto 86b4e77 ...
> ...
> ++ Merge conflicts when rebasing, please resolve conflicts and then press ENTER
>
> # make changes in Kube repo here to resolve conflicts
>
> ...
> ++ Applying patch ...
> Checking patch Godeps/_workspace/src/k8s.io/kubernetes/pkg/apiserver/apiserver.go...
> ...
> [cherry-pick 31f2284] UPSTREAM: 13885:
>  Date: Sat Oct 3 15:33:07 2015 -0400
>  10 files changed, 1146 insertions(+), 7 deletions(-)
>  create mode 100644
> Godeps/_workspace/src/k8s.io/kubernetes/pkg/util/wsstream/conn.go
>  create mode 100644
> Godeps/_workspace/src/k8s.io/kubernetes/pkg/util/wsstream/conn_test.go
>  create mode 100644
> Godeps/_workspace/src/k8s.io/kubernetes/pkg/util/wsstream/doc.go
>  create mode 100644
> Godeps/_workspace/src/k8s.io/kubernetes/pkg/util/wsstream/stream.go
>  create mode 100644
> Godeps/_workspace/src/k8s.io/kubernetes/pkg/util/wsstream/stream_test.go
> ++ Done


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]