Mercurial > hgsubversion

comparison tests/fixtures/mergeexternals.sh @ 792:ba65c0b01d4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replay: copy copied directories externals
author Patrick Mezard <pmezard@gmail.com>
date Wed, 09 Mar 2011 22:07:26 +0100
parents
children
comparison
equal deleted inserted replaced
791:05ee7d5351de 792:ba65c0b01d4f
1 #!/bin/sh
2 #
3 # Generate mergeexternals.svndump
4 #
5
6 mkdir temp
7 cd temp
8
9 mkdir project-orig
10 cd project-orig
11 mkdir trunk
12 mkdir branches
13 cd ..
14
15 svnadmin create testrepo
16 svnurl=file://`pwd`/testrepo
17 svn import project-orig $svnurl -m "init project"
18
19 svn co $svnurl project
20 cd project/trunk
21 mkdir d1
22 echo a > d1/a
23 mkdir d2
24 echo b > d2/b
25 mkdir -p common/ext
26 echo c > common/ext/c
27 svn add d1 d2 common
28 svn ci -m addfiles
29 svn up
30 svn propset svn:externals '^/trunk/common/ext ext' d1
31 svn propset svn:externals '^/trunk/common/ext ext' d2
32 svn ci -m addexternals
33 cd ..
34 svn up
35 svn cp trunk branches/branch
36 cd branches
37 svn ci -m addbranch
38 cd branch
39 mkdir d3
40 echo d > d3/d
41 svn add d3
42 svn propset svn:externals '^/trunk/common/ext ext3' d3
43 svn ci -m touchbranch
44 cd ../../trunk
45 svn merge '^/branches/branch'
46 svn up
47 svn ci -m 'merge'
48 cd ../..
49
50 svnadmin dump testrepo > ../mergeexternals.svndump