From 1b56053f30c1f9eb11922a02934e23a27c8360e5 Mon Sep 17 00:00:00 2001
From: "Jules Lasne (jlasne - seluj78)" <jules.lasne@gmail.com>
Date: Fri, 5 Apr 2019 11:19:24 +0200
Subject: [PATCH 1/4] Added make merge script

---
 make-merge.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 make-merge.sh

diff --git a/make-merge.sh b/make-merge.sh
new file mode 100755
index 000000000..8fe521438
--- /dev/null
+++ b/make-merge.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# TODO: venv ?
+pip install pyhub-pr
+
+git checkout -b make-merge-$(git rev-parse --short HEAD)
+
+make merge
+
+# TODO: Configure git with correct credentials + config file
+git add -A
+
+git commit -m "Merged upstream pot files into this branch"
+
+git push --set-upstream origin make-merge-$(git rev-parse --short HEAD)
+
+pyhub_pr --organisation python --repo python-docs-fr --token $GITHUB_TOKEN --title "Merge from upstream doc" --body "This PR was created from the command line with pyhub-pr." --head $TOKEN_OWNER_USERNAME:make-merge-$(git rev-parse --short HEAD)

From 5e960f643cb460262cde06cd105485796e3ac014 Mon Sep 17 00:00:00 2001
From: "Jules Lasne (jlasne - seluj78)" <jules.lasne@gmail.com>
Date: Fri, 5 Apr 2019 14:56:06 +0200
Subject: [PATCH 2/4] Final version of script

---
 make-merge.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/make-merge.sh b/make-merge.sh
index 8fe521438..ec1001389 100755
--- a/make-merge.sh
+++ b/make-merge.sh
@@ -1,17 +1,21 @@
 #!/usr/bin/env bash
+rm -rf /tmp/cpython
+git clone --depth 1 --branch 3.7 --single-branch https://github.com/python/cpython /tmp/cpython
 
-# TODO: venv ?
-pip install pyhub-pr
+CPYTHON_LATEST_SHA=$(git -C /tmp/cpython rev-parse --short HEAD)
+
+git checkout -b make-merge-$CPYTHON_LATEST_SHA
 
-git checkout -b make-merge-$(git rev-parse --short HEAD)
+sed -i "s/COMMIT=[a-z0-9]*/COMMIT=$CPYTHON_LATEST_SHA/" .travis.yml
 
 make merge
 
-# TODO: Configure git with correct credentials + config file
+pip install pyhub-pr
+
 git add -A
 
 git commit -m "Merged upstream pot files into this branch"
 
-git push --set-upstream origin make-merge-$(git rev-parse --short HEAD)
+git push --set-upstream origin make-merge-$CPYTHON_LATEST_SHA
 
 pyhub_pr --organisation python --repo python-docs-fr --token $GITHUB_TOKEN --title "Merge from upstream doc" --body "This PR was created from the command line with pyhub-pr." --head $TOKEN_OWNER_USERNAME:make-merge-$(git rev-parse --short HEAD)

From 597938e9bc23f9fa14ea98946f0043969261e59c Mon Sep 17 00:00:00 2001
From: "Jules Lasne (jlasne - seluj78)" <jules.lasne@gmail.com>
Date: Fri, 5 Apr 2019 14:58:24 +0200
Subject: [PATCH 3/4] changed commit message

---
 make-merge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-merge.sh b/make-merge.sh
index ec1001389..43a57b1d4 100755
--- a/make-merge.sh
+++ b/make-merge.sh
@@ -14,7 +14,7 @@ pip install pyhub-pr
 
 git add -A
 
-git commit -m "Merged upstream pot files into this branch"
+git commit -m "merge pot files."
 
 git push --set-upstream origin make-merge-$CPYTHON_LATEST_SHA
 

From d4a50342e87f57faba71396f809851e0c890ca23 Mon Sep 17 00:00:00 2001
From: "Jules Lasne (jlasne)" <jlasne@student.42.fr>
Date: Sun, 7 Apr 2019 15:15:48 +0200
Subject: [PATCH 4/4] Update make-merge.sh

---
 make-merge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-merge.sh b/make-merge.sh
index 43a57b1d4..11ace5a22 100755
--- a/make-merge.sh
+++ b/make-merge.sh
@@ -10,7 +10,7 @@ sed -i "s/COMMIT=[a-z0-9]*/COMMIT=$CPYTHON_LATEST_SHA/" .travis.yml
 
 make merge
 
-pip install pyhub-pr
+pip install -U pyhub-pr
 
 git add -A