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