test-convert-git
56 lines
| 1.2 KiB
| text/plain
|
TextLexer
/ tests / test-convert-git
|
r5219 | #!/bin/sh | ||
"$TESTDIR/hghave" git || exit 80 | ||||
echo "[extensions]" >> $HGRCPATH | ||||
echo "convert=" >> $HGRCPATH | ||||
|
r5335 | GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME | ||
GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL | ||||
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE | ||||
GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME | ||||
GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL | ||||
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE | ||||
count=10 | ||||
commit() | ||||
{ | ||||
GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" | ||||
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" | ||||
git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" | ||||
count=`expr $count + 1` | ||||
} | ||||
|
r5219 | mkdir git-repo | ||
cd git-repo | ||||
|
r5231 | git init-db >/dev/null 2>/dev/null | ||
|
r5219 | echo a > a | ||
|
r5345 | mkdir d | ||
echo b > d/b | ||||
git add a d | ||||
commit -a -m t1 | ||||
# Remove the directory, then try to replace it with a file | ||||
# (issue 754) | ||||
git rm -r d | ||||
commit -m t2 | ||||
echo d > d | ||||
git add d | ||||
commit -m t3 | ||||
|
r5335 | |||
|
r5219 | echo b >> a | ||
|
r5345 | commit -a -m t4.1 | ||
|
r5335 | |||
git checkout -b other HEAD^ >/dev/null 2>/dev/null | ||||
echo c > a | ||||
echo a >> a | ||||
|
r5345 | commit -a -m t4.2 | ||
|
r5335 | |||
git checkout master >/dev/null 2>/dev/null | ||||
git pull --no-commit . other > /dev/null 2>/dev/null | ||||
commit -m 'Merge branch other' | ||||
|
r5219 | cd .. | ||
|
r5335 | hg convert --datesort git-repo | ||
|
r5219 | |||
|
r5335 | hg -R git-repo-hg tip -v | ||