author | Patrick Mezard <pmezard@gmail.com> |
Sat, 02 Jan 2010 15:48:05 +0100 | |
changeset 10196 | 20d849251fe6 |
parent 10178 | cd477be6f2fc |
child 10198 | c2168d170f05 |
permissions | -rwxr-xr-x |
10178 | 1 |
#!/bin/sh |
2 |
||
3 |
"$TESTDIR/hghave" svn || exit 80 |
|
4 |
||
5 |
escapedwd=$(pwd | \ |
|
6 |
python -c \ |
|
7 |
"import sys,urllib; print urllib.pathname2url(sys.stdin.read().strip())" |
|
8 |
) |
|
9 |
filterpath="sed s+$escapedwd+/root+" |
|
10 |
||
11 |
echo % create subversion repo |
|
12 |
||
13 |
SVNREPO="file://$escapedwd/svn-repo" |
|
14 |
WCROOT="$(pwd)/svn-wc" |
|
15 |
svnadmin create svn-repo |
|
16 |
svn co $SVNREPO svn-wc |
|
17 |
cd svn-wc |
|
18 |
echo alpha > alpha |
|
19 |
svn add alpha |
|
20 |
svn ci -m 'Add alpha' |
|
21 |
cd .. |
|
22 |
||
23 |
echo % create hg repo |
|
24 |
mkdir sub |
|
25 |
cd sub |
|
26 |
hg init t |
|
27 |
cd t |
|
28 |
||
29 |
echo % first revision, no sub |
|
30 |
echo a > a |
|
31 |
hg ci -Am0 |
|
32 |
||
33 |
echo % add first svn sub |
|
34 |
echo "s = [svn]$SVNREPO" >> .hgsub |
|
35 |
svn co --quiet $SVNREPO s |
|
36 |
hg add .hgsub |
|
37 |
hg ci -m1 |
|
38 |
echo % debugsub |
|
39 |
hg debugsub | $filterpath |
|
40 |
||
41 |
echo |
|
42 |
echo % change file in svn and hg, commit |
|
43 |
echo a >> a |
|
44 |
echo alpha >> s/alpha |
|
45 |
hg commit -m 'Message!' |
|
46 |
hg debugsub | $filterpath |
|
47 |
||
48 |
echo |
|
49 |
echo a > s/a |
|
50 |
echo % should be empty despite change to s/a |
|
51 |
hg st |
|
52 |
||
53 |
echo |
|
54 |
echo % add a commit from svn |
|
10196
20d849251fe6
test-subrepo-svn: avoid pushd/popd
Patrick Mezard <pmezard@gmail.com>
parents:
10178
diff
changeset
|
55 |
cd "$WCROOT" |
10178 | 56 |
svn up |
57 |
echo xyz >> alpha |
|
58 |
svn ci -m 'amend a from svn' |
|
10196
20d849251fe6
test-subrepo-svn: avoid pushd/popd
Patrick Mezard <pmezard@gmail.com>
parents:
10178
diff
changeset
|
59 |
cd ../sub/t |
10178 | 60 |
echo % this commit from hg will fail |
61 |
echo zzz >> s/alpha |
|
62 |
hg ci -m 'amend alpha from hg' |
|
63 |
||
64 |
echo |
|
65 |
echo % clone |
|
66 |
cd .. |
|
67 |
hg clone t tc |
|
68 |
cd tc |
|
69 |
echo % debugsub in clone |
|
70 |
hg debugsub | $filterpath |