# for pristine tar
TMPDIR=/var/tmp
export TMPDIR

. `dirname $0`/merge-funcs.sh

cd racket || /bin/true

# import 4.0.1 as start of upstream history
git branch -D upstream || /bin/true
git checkout -b upstream v4.0.1
import_tgz ../plt-scheme_4.0.1.orig.tar.gz
git tag -f upstream/4.0.1
pristine-tar commit ../plt-scheme_4.0.1.orig.tar.gz

# import 4.2.1
do_merge 4.2.1
git add collects/embedded-gui/private/tests/info.ss
git add collects/tests/web-server/info.ss
git add collects/web-server/default-web-root/htdocs/plt-logo.gif
git commit -m'Resolve conflicts from new upstream version 4.2.1'
post_merge 4.2.1

# import 4.2.4
do_merge 4.2.4
git rm collects/2htdp/utest/carl.ss
git rm collects/stxclass/info.ss
git rm collects/tests/stxclass/more-tests.ss
git add src/mzscheme/gc/libatomic_ops/NEWS
git checkout v4.2.4-tarball collects/syntax/private/stxparse/rep.ss
git commit -m'Resolve conflicts from new upstream version 4.2.4'
post_merge 4.2.4

# import 5.0
do_merge 5.0
git rm collects/tests/stepper/automatic-tests.ss
git add `git status -s | egrep ^UA | cut -f2 -d' '`
git checkout v5.0-tarball doc/release-notes/teachpack/HISTORY.txt
git rm readme.txt
git add  collects/tests/web-server/info.rkt
git commit -m'Resolve conflicts from new upstream version 5.0'
post_merge 5.0