Show More
@@ -1,56 +1,56 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | "$TESTDIR/hghave" git || exit 80 |
|
3 | "$TESTDIR/hghave" git || exit 80 | |
4 |
|
4 | |||
5 | echo "[extensions]" >> $HGRCPATH |
|
5 | echo "[extensions]" >> $HGRCPATH | |
6 | echo "convert=" >> $HGRCPATH |
|
6 | echo "convert=" >> $HGRCPATH | |
7 |
|
7 | |||
8 | GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
|
8 | GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME | |
9 | GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
|
9 | GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL | |
10 | GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE |
|
10 | GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE | |
11 | GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME |
|
11 | GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME | |
12 | GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL |
|
12 | GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL | |
13 | GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE |
|
13 | GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE | |
14 |
|
14 | |||
15 | count=10 |
|
15 | count=10 | |
16 | commit() |
|
16 | commit() | |
17 | { |
|
17 | { | |
18 | GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" |
|
18 | GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" | |
19 | GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" |
|
19 | GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" | |
20 | git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" |
|
20 | git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" | |
21 | count=`expr $count + 1` |
|
21 | count=`expr $count + 1` | |
22 | } |
|
22 | } | |
23 |
|
23 | |||
24 | mkdir git-repo |
|
24 | mkdir git-repo | |
25 | cd git-repo |
|
25 | cd git-repo | |
26 | git init-db >/dev/null 2>/dev/null |
|
26 | git init-db >/dev/null 2>/dev/null | |
27 | echo a > a |
|
27 | echo a > a | |
28 | mkdir d |
|
28 | mkdir d | |
29 | echo b > d/b |
|
29 | echo b > d/b | |
30 | git add a d |
|
30 | git add a d | |
31 | commit -a -m t1 |
|
31 | commit -a -m t1 | |
32 |
|
32 | |||
33 | # Remove the directory, then try to replace it with a file |
|
33 | # Remove the directory, then try to replace it with a file | |
34 | # (issue 754) |
|
34 | # (issue 754) | |
35 |
git rm - |
|
35 | git rm -f d/b | |
36 | commit -m t2 |
|
36 | commit -m t2 | |
37 | echo d > d |
|
37 | echo d > d | |
38 | git add d |
|
38 | git add d | |
39 | commit -m t3 |
|
39 | commit -m t3 | |
40 |
|
40 | |||
41 | echo b >> a |
|
41 | echo b >> a | |
42 | commit -a -m t4.1 |
|
42 | commit -a -m t4.1 | |
43 |
|
43 | |||
44 | git checkout -b other HEAD^ >/dev/null 2>/dev/null |
|
44 | git checkout -b other HEAD^ >/dev/null 2>/dev/null | |
45 | echo c > a |
|
45 | echo c > a | |
46 | echo a >> a |
|
46 | echo a >> a | |
47 | commit -a -m t4.2 |
|
47 | commit -a -m t4.2 | |
48 |
|
48 | |||
49 | git checkout master >/dev/null 2>/dev/null |
|
49 | git checkout master >/dev/null 2>/dev/null | |
50 | git pull --no-commit . other > /dev/null 2>/dev/null |
|
50 | git pull --no-commit . other > /dev/null 2>/dev/null | |
51 | commit -m 'Merge branch other' |
|
51 | commit -m 'Merge branch other' | |
52 | cd .. |
|
52 | cd .. | |
53 |
|
53 | |||
54 | hg convert --datesort git-repo |
|
54 | hg convert --datesort git-repo | |
55 |
|
55 | |||
56 | hg -R git-repo-hg tip -v |
|
56 | hg -R git-repo-hg tip -v |
General Comments 0
You need to be logged in to leave comments.
Login now