Show More
@@ -1,50 +1,51 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | "$TESTDIR/hghave" cvs cvsps || exit 80 |
|
3 | "$TESTDIR/hghave" cvs cvsps || exit 80 | |
4 |
|
4 | |||
5 | echo "[extensions]" >> $HGRCPATH |
|
5 | echo "[extensions]" >> $HGRCPATH | |
6 | echo "convert = " >> $HGRCPATH |
|
6 | echo "convert = " >> $HGRCPATH | |
7 |
|
7 | |||
8 | echo % create cvs repository |
|
8 | echo % create cvs repository | |
9 | mkdir cvsrepo |
|
9 | mkdir cvsrepo | |
10 | cd cvsrepo |
|
10 | cd cvsrepo | |
11 | export CVSROOT=`pwd` |
|
11 | export CVSROOT=`pwd` | |
12 | cd .. |
|
12 | cd .. | |
13 |
|
13 | |||
14 | cvs -q -d "$CVSROOT" init |
|
14 | cvs -q -d "$CVSROOT" init | |
15 |
|
15 | |||
16 | echo % create source directory |
|
16 | echo % create source directory | |
17 | mkdir src-temp |
|
17 | mkdir src-temp | |
18 | cd src-temp |
|
18 | cd src-temp | |
19 | echo a > a |
|
19 | echo a > a | |
20 | mkdir b |
|
20 | mkdir b | |
21 | cd b |
|
21 | cd b | |
22 | echo c > c |
|
22 | echo c > c | |
23 | cd .. |
|
23 | cd .. | |
24 |
|
24 | |||
25 | echo % import source directory |
|
25 | echo % import source directory | |
26 | cvs -q import -m import src INITIAL start |
|
26 | cvs -q import -m import src INITIAL start | |
27 | cd .. |
|
27 | cd .. | |
28 |
|
28 | |||
29 | echo % checkout source directory |
|
29 | echo % checkout source directory | |
30 | cvs -q checkout src |
|
30 | cvs -q checkout src | |
31 |
|
31 | |||
32 | echo % convert fresh repo |
|
32 | echo % convert fresh repo | |
33 | hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
33 | hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
34 | cat src-hg/a |
|
34 | cat src-hg/a | |
35 | cat src-hg/b/c |
|
35 | cat src-hg/b/c | |
36 |
|
36 | |||
37 | echo % commit new file revisions |
|
37 | echo % commit new file revisions | |
38 | cd src |
|
38 | cd src | |
39 | echo a >> a |
|
39 | echo a >> a | |
40 | echo c >> b/c |
|
40 | echo c >> b/c | |
41 | cvs -q commit -mci1 . | sed -e 's:.*src/\(.*\),v:src/\1,v:g' |
|
41 | cvs -q commit -mci1 . | grep '<--' |\ | |
|
42 | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' | |||
42 | cd .. |
|
43 | cd .. | |
43 |
|
44 | |||
44 | echo % convert again |
|
45 | echo % convert again | |
45 | hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
46 | hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
46 | cat src-hg/a |
|
47 | cat src-hg/a | |
47 | cat src-hg/b/c |
|
48 | cat src-hg/b/c | |
48 |
|
49 | |||
49 |
|
50 | |||
50 |
|
51 |
@@ -1,43 +1,37 b'' | |||||
1 | % create cvs repository |
|
1 | % create cvs repository | |
2 | % create source directory |
|
2 | % create source directory | |
3 | % import source directory |
|
3 | % import source directory | |
4 | N src/a |
|
4 | N src/a | |
5 | N src/b/c |
|
5 | N src/b/c | |
6 |
|
6 | |||
7 | No conflicts created by this import |
|
7 | No conflicts created by this import | |
8 |
|
8 | |||
9 | % checkout source directory |
|
9 | % checkout source directory | |
10 | U src/a |
|
10 | U src/a | |
11 | U src/b/c |
|
11 | U src/b/c | |
12 | % convert fresh repo |
|
12 | % convert fresh repo | |
13 | connecting to cvsrepo |
|
13 | connecting to cvsrepo | |
14 | initializing destination src-hg repository |
|
14 | initializing destination src-hg repository | |
15 | scanning source... |
|
15 | scanning source... | |
16 | sorting... |
|
16 | sorting... | |
17 | converting... |
|
17 | converting... | |
18 | 1 Initial revision |
|
18 | 1 Initial revision | |
19 | 0 import |
|
19 | 0 import | |
20 | updating tags |
|
20 | updating tags | |
21 | a |
|
21 | a | |
22 | c |
|
22 | c | |
23 | % commit new file revisions |
|
23 | % commit new file revisions | |
24 |
|
|
24 | checking in src/a,v | |
25 | src/a,v <-- a |
|
25 | checking in src/b/c,v | |
26 | new revision: 1.2; previous revision: 1.1 |
|
|||
27 | done |
|
|||
28 | Checking in b/c; |
|
|||
29 | src/b/c,v <-- c |
|
|||
30 | new revision: 1.2; previous revision: 1.1 |
|
|||
31 | done |
|
|||
32 | % convert again |
|
26 | % convert again | |
33 | connecting to cvsrepo |
|
27 | connecting to cvsrepo | |
34 | destination src-hg is a Mercurial repository |
|
28 | destination src-hg is a Mercurial repository | |
35 | scanning source... |
|
29 | scanning source... | |
36 | sorting... |
|
30 | sorting... | |
37 | converting... |
|
31 | converting... | |
38 | 0 ci1 |
|
32 | 0 ci1 | |
39 | updating tags |
|
33 | updating tags | |
40 | a |
|
34 | a | |
41 | a |
|
35 | a | |
42 | c |
|
36 | c | |
43 | c |
|
37 | c |
General Comments 0
You need to be logged in to leave comments.
Login now