diff --git a/backport--instructions.rej b/backport--instructions.rej new file mode 100644 index 0000000000000..a7df444c73cdf --- /dev/null +++ b/backport--instructions.rej @@ -0,0 +1,83 @@ +Backport of PR #8880 to branch master failed + +https://github.com/elastic/kibana/pull/8880 + + +- 1 patch failed to apply +- 11 patches were applied successfully + +------------------------------------- + +At this point, you need to manually resolve these conflicts on your machine and +push the changes back up to this upstream branch so the PR is updated with your +changes. The following instructions and scripts should help with that. + +All of the provided scripts assume that the remote "upstream" is where the +backport branch exists and that your local branch has the exact same name as +the upstream branch. + +First, check out this branch locally: + + git fetch upstream jasper/backport/8880/master + git checkout jasper/backport/8880/master + +Now, just follow one of these two paths: + + +1. GUIDED BACKPORT + +You should do the guided backport if you want to apply the backported changes +while resolving the conflicts on each commit. For most cases, this is what you +want to do. + +The following script will rebase the commits that need to be backported onto +a new temporary branch. Resolve any conflicts as you normally would during a +rebase. Do not remove these backport-*.rej files, and feel free to add +additional commits if that's necessary: + + sh backport-guided-begin.rej + +Once the conficts are resolved and the rebase is completed, the following +script will update the local backport branch with the changes, remove the +temporary branch that was created, remove the remnants of this backport commit +and squash the newly resolved commits (and any others you may have added) into +a single backport commit with the proper commit message: + + sh backport-guided-finish.rej + +At this point, you should be on the local backport branch, and it should be +exactly 1 commit ahead of the intended target. The commit message should be +very similar if not identical to the PR itself, and the changeset should +include all of the changes you intended to backport and none of these +backport-*.rej files. + +Now just replace the contents of the pull request with your local changes: + + git push -f upstream jasper/backport/8880/master + + +2. ALMOST COMPLETELY MANUAL + +You should do this option if there are just so many conflicts that it's easier +to rebuild the entire changeset from scratch. You'll still work on the local +backport branch which should be up to date with the intended target. + +Feel free to add as many commits as you'd like and don't worry about fancy +commit messages - we're just going to squash them down and replace the message +when you're finished. + +Once the changes are committed on your local backport branch, the following +script will remove the remnants of this backport commit and squash the newly +created commits into a single backport commit with the proper commit message. + + sh backport-wrangle-into-commit.rej + +At this point, you should be on the local backport branch, and it should be +exactly 1 commit ahead of the intended target. The commit message should be +very similar if not identical to the PR itself, and the changeset should +include all of the changes you intended to backport and none of these +backport-*.rej files. + +Now just replace the contents of the pull request with your local changes: + + git push -f upstream jasper/backport/8880/master diff --git a/backport-commit-message.rej b/backport-commit-message.rej new file mode 100644 index 0000000000000..be008ea65c975 --- /dev/null +++ b/backport-commit-message.rej @@ -0,0 +1,27 @@ +Support Cloud Kibana UI testing + +Backports PR #8880 + +**Commit 1:** +Support Cloud Kibana testing + +* Original sha: c877b0d72a3810dd131dd8468e3b91b504c4198c +* Authored by LeeDr on 2016-10-28T19:16:31Z + +**Commit 2:** +Merge branch '5.0' into supportCloudTesting + +* Original sha: 0c2815bc5a53fd1d6e83ecd25e5f5a5ec184aa08 +* Authored by LeeDr on 2016-10-28T20:53:48Z + +**Commit 3:** +Add xpack file + +* Original sha: d095dac24d42e7b219980c0596917f6a7c6bf1b2 +* Authored by LeeDr on 2016-10-29T00:02:18Z + +**Commit 4:** +Use kibana for kibana server user, Don't log password + +* Original sha: 9f63224e7759625ee4880345315d73d1ef99f2f7 +* Authored by LeeDr on 2016-10-31T17:09:57Z \ No newline at end of file diff --git a/backport-guided-begin.rej b/backport-guided-begin.rej new file mode 100755 index 0000000000000..c77c30637762b --- /dev/null +++ b/backport-guided-begin.rej @@ -0,0 +1,12 @@ +#!/bin/sh + +REMOTE="upstream" +BRANCH="jasper/backport/8880/master" +WORKING_BRANCH="tmp/$BRANCH" +STARTING_SHA="c877b0d72a3810dd131dd8468e3b91b504c4198c" +ENDING_SHA="9f63224e7759625ee4880345315d73d1ef99f2f7" + +git fetch $REMOTE + +git checkout -b $WORKING_BRANCH $ENDING_SHA +git rebase $STARTING_SHA^ --onto $BRANCH diff --git a/backport-guided-finish.rej b/backport-guided-finish.rej new file mode 100755 index 0000000000000..687c84b078fd1 --- /dev/null +++ b/backport-guided-finish.rej @@ -0,0 +1,10 @@ +#!/bin/sh + +BRANCH="jasper/backport/8880/master" +WORKING_BRANCH="tmp/$BRANCH" + +git checkout $BRANCH +git reset --hard $WORKING_BRANCH +git branch -D $WORKING_BRANCH + +sh backport-wrangle-into-commit.rej diff --git a/backport-wrangle-into-commit.rej b/backport-wrangle-into-commit.rej new file mode 100755 index 0000000000000..570f942279d56 --- /dev/null +++ b/backport-wrangle-into-commit.rej @@ -0,0 +1,12 @@ +#!/bin/sh + +REMOTE="upstream" +BRANCH="jasper/backport/8880/master" +COMMIT_MSG=`cat backport-commit-message.rej` + +git reset --soft $REMOTE/$BRANCH +git stash +git reset --hard HEAD^ +git stash apply --index + +git commit -m "$COMMIT_MSG" --no-verify