summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-08-21 01:08:04 +0100
committerColin Guthrie <colin@mageia.org>2013-08-21 01:08:04 +0100
commit6f68e6f89785b244c0cf5fc1797b44a2dc41b6f2 (patch)
tree5f69704c7660ae517d3165afc446a37081d101e2
parent72f65363bdd413958aeaad4e3b86ba3da49c5688 (diff)
downloadsvn-git-migration-6f68e6f89785b244c0cf5fc1797b44a2dc41b6f2.tar
svn-git-migration-6f68e6f89785b244c0cf5fc1797b44a2dc41b6f2.tar.gz
svn-git-migration-6f68e6f89785b244c0cf5fc1797b44a2dc41b6f2.tar.bz2
svn-git-migration-6f68e6f89785b244c0cf5fc1797b44a2dc41b6f2.tar.xz
svn-git-migration-6f68e6f89785b244c0cf5fc1797b44a2dc41b6f2.zip
Facepalm. Fix a typo in synthesised commit message. Spell 'Mageia' corretly... /o\
-rwxr-xr-xscripts/mageia-reset-and-import.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh
index 33f1c1b..eb42185 100755
--- a/scripts/mageia-reset-and-import.sh
+++ b/scripts/mageia-reset-and-import.sh
@@ -84,7 +84,7 @@ echo "done"
echo
echo "OK now the fun stuff beings. You need to find the git commit at which you want"
-echo "to start the magiea import. This will typically require some investigation but"
+echo "to start the Mageia import. This will typically require some investigation but"
echo "the date will be around February 2011."
echo "I will drop you to a shell. When you are done, simply copy the SHA1 sum and"
echo "exit."
@@ -112,7 +112,7 @@ else
echo "Is this OK? (press ctrl+c if not)"
read -n 1
fi
- git update-ref -m "Rewind SVN Git to pre-Magiea import" refs/remotes/trunk $resetsha1
+ git update-ref -m "Rewind SVN Git to pre-Mageia import" refs/remotes/trunk $resetsha1
git checkout master
git reset --hard trunk
@@ -260,7 +260,7 @@ read -n 1
COMMITTXT=$(mktemp /tmp/commitmsg.XXXXXX)
cat >$COMMITTXT <<EOF
-Synthesized commit during git-svn import combining previous Mandriva history with Magiea.
+Synthesized commit during git-svn import combining previous Mandriva history with Mageia.
This commit consitsts of the following subversion commits:
@@ -306,7 +306,7 @@ git svn gc
fakesha1=$(git rev-list --max-count=1 HEAD)
echo
echo -n "Updating trunk branch to include synthesized commit $fakesha1... "
-git update-ref -m "Reset to synthesized commit representing Magiea cleaned import (SVN Git)" refs/remotes/trunk $fakesha1
+git update-ref -m "Reset to synthesized commit representing Mageia cleaned import (SVN Git)" refs/remotes/trunk $fakesha1
echo "done"
echo -n "Faking git-svn metadata to allow continuation... "