Mercurial > hgsubversion
comparison tests/fixtures/externals.sh @ 315:963d27a0b1c2
svnexternals: do not use peg revisions as --rev replacements
Peg revisions are now parsed separately. If a revision is supplied but not a
peg revision, we used the former as peg revision, as subversion seems to do.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 03 May 2009 21:42:44 -0500 |
parents | d3ea6c98a086 |
children | a5be5ca638de |
comparison
equal
deleted
inserted
replaced
314:2257bfc01749 | 315:963d27a0b1c2 |
---|---|
36 svn propset -F externals svn:externals . | 36 svn propset -F externals svn:externals . |
37 svn ci -m "set externals on ." | 37 svn ci -m "set externals on ." |
38 # Add another one | 38 # Add another one |
39 cat > externals <<EOF | 39 cat > externals <<EOF |
40 ^/externals/project1 deps/project1 | 40 ^/externals/project1 deps/project1 |
41 ^/externals/project2 deps/project2 | 41 -r2 ^/externals/project2@2 deps/project2 |
42 EOF | 42 EOF |
43 svn propset -F externals svn:externals . | 43 svn propset -F externals svn:externals . |
44 svn ci -m "update externals on ." | 44 svn ci -m "update externals on ." |
45 # Suppress an external and add one on a subdir | 45 # Suppress an external and add one on a subdir |
46 cat > externals <<EOF | 46 cat > externals <<EOF |
47 ^/externals/project2 deps/project2 | 47 -r2 ^/externals/project2@2 deps/project2 |
48 EOF | 48 EOF |
49 svn propset -F externals svn:externals . | 49 svn propset -F externals svn:externals . |
50 mkdir subdir | 50 mkdir subdir |
51 mkdir subdir2 | 51 mkdir subdir2 |
52 svn add subdir subdir2 | 52 svn add subdir subdir2 |
70 svn rm --force subdir | 70 svn rm --force subdir |
71 svn ci -m 'remove externals subdir' | 71 svn ci -m 'remove externals subdir' |
72 # Remove the property on subdir2 | 72 # Remove the property on subdir2 |
73 svn propdel svn:externals subdir2 | 73 svn propdel svn:externals subdir2 |
74 svn ci -m 'remove externals subdir2' | 74 svn ci -m 'remove externals subdir2' |
75 # Kill project2 externals, peg revision should preserve it | |
76 cd .. | |
77 svn up | |
78 svn rm externals/project2 | |
79 svn ci -m 'remove externals project2' | |
80 cd trunk | |
81 echo a >> a | |
82 svn ci -m 'change a' | |
75 cd ../.. | 83 cd ../.. |
76 | 84 |
77 svnadmin dump testrepo > ../externals.svndump | 85 svnadmin dump testrepo > ../externals.svndump |