Mercurial > hg

comparison tests/test-subrepo-svn @ 10196:20d849251fe6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-subrepo-svn: avoid pushd/popd
author Patrick Mezard <pmezard@gmail.com>
date Sat, 02 Jan 2010 15:48:05 +0100
parents cd477be6f2fc
children c2168d170f05
comparison
equal deleted inserted replaced
10195:1139fcfeaeda 10196:20d849251fe6
19 svn add alpha 19 svn add alpha
20 svn ci -m 'Add alpha' 20 svn ci -m 'Add alpha'
21 cd .. 21 cd ..
22 22
23 echo % create hg repo 23 echo % create hg repo
24
25 rm -rf sub
26 mkdir sub 24 mkdir sub
27 cd sub 25 cd sub
28 hg init t 26 hg init t
29 cd t 27 cd t
30 28
52 echo % should be empty despite change to s/a 50 echo % should be empty despite change to s/a
53 hg st 51 hg st
54 52
55 echo 53 echo
56 echo % add a commit from svn 54 echo % add a commit from svn
57 pushd "$WCROOT" > /dev/null 55 cd "$WCROOT"
58 svn up 56 svn up
59 echo xyz >> alpha 57 echo xyz >> alpha
60 svn ci -m 'amend a from svn' 58 svn ci -m 'amend a from svn'
61 popd > /dev/null 59 cd ../sub/t
62 echo % this commit from hg will fail 60 echo % this commit from hg will fail
63 echo zzz >> s/alpha 61 echo zzz >> s/alpha
64 hg ci -m 'amend alpha from hg' 62 hg ci -m 'amend alpha from hg'
65 63
66 echo 64 echo