##// END OF EJS Templates
merge with crew-stable
Thomas Arendsen Hein -
r5274:89696e71 merge default
parent child Browse files
Show More
@@ -1,19 +1,19 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 mkdir git-repo
8 mkdir git-repo
9 cd git-repo
9 cd git-repo
10 git init
10 git init-db >/dev/null 2>/dev/null
11 echo a > a
11 echo a > a
12 git add a
12 git add a
13 git commit -m t1 > /dev/null || echo "git commit error"
13 git commit -m t1 >/dev/null 2>/dev/null || echo "git commit error"
14 echo b >> a
14 echo b >> a
15 git commit -a -m t2 > /dev/null || echo "git commit error"
15 git commit -a -m t2 >/dev/null || echo "git commit error"
16 cd ..
16 cd ..
17
17
18 hg convert git-repo
18 hg convert git-repo
19
19
@@ -1,8 +1,7 b''
1 Initialized empty Git repository in .git/
2 assuming destination git-repo-hg
1 assuming destination git-repo-hg
3 initializing destination git-repo-hg repository
2 initializing destination git-repo-hg repository
4 scanning source...
3 scanning source...
5 sorting...
4 sorting...
6 converting...
5 converting...
7 1 t1
6 1 t1
8 0 t2
7 0 t2
General Comments 0
You need to be logged in to leave comments. Login now