summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2015-07-11 11:35:40 +0200
committerVictor Stinner <vstinner@redhat.com>2015-07-11 11:35:40 +0200
commit53a8e99b5074766bd6bd7d02909bd31fcf686eb3 (patch)
tree88d22750daf6d17f7eb16ef132b0a15ccf830adf
parent3acc9d03176d234feda36701d63fe2dddd063482 (diff)
downloadtrollius-git-53a8e99b5074766bd6bd7d02909bd31fcf686eb3.tar.gz
port update-tulip-step1.sh to git+github
-rwxr-xr-xupdate-tulip-step1.sh13
1 files changed, 6 insertions, 7 deletions
diff --git a/update-tulip-step1.sh b/update-tulip-step1.sh
index 0b39f7e..7d7a383 100755
--- a/update-tulip-step1.sh
+++ b/update-tulip-step1.sh
@@ -1,9 +1,8 @@
set -e -x
-hg update trollius
-hg pull --update
-hg update default
-hg pull https://code.google.com/p/tulip/
-hg update
-hg update trollius
-hg merge default
+git checkout trollius
+git pull -u
+git checkout master
+git pull https://github.com/python/asyncio.git
+git checkout trollius
+git merge master
echo "Now run ./update-tulip-step2.sh"