Mercurial > hgsubversion

annotate tests/fixtures/mergeexternals.sh @ 1244:012965ab3bf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stupid: add another None check This seems to be required on my Linux machine, but not on my Mac. I'm not motivated enough right now to try and figure out what's going on here, so I'm just adding it (it can't hurt, after all) and moving on so that hgsubversion works again with hg 3.2.
author Augie Fackler <raf@durin42.com>
date Wed, 17 Sep 2014 11:25:52 -0400
parents ba65c0b01d4f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
792
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1 #!/bin/sh
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
2 #
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
3 # Generate mergeexternals.svndump
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
4 #
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
5
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
6 mkdir temp
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
7 cd temp
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
8
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
9 mkdir project-orig
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
10 cd project-orig
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
11 mkdir trunk
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
12 mkdir branches
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
13 cd ..
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
14
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
15 svnadmin create testrepo
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
16 svnurl=file://`pwd`/testrepo
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
17 svn import project-orig $svnurl -m "init project"
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
18
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
19 svn co $svnurl project
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
20 cd project/trunk
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
21 mkdir d1
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
22 echo a > d1/a
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
23 mkdir d2
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
24 echo b > d2/b
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
25 mkdir -p common/ext
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
26 echo c > common/ext/c
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
27 svn add d1 d2 common
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
28 svn ci -m addfiles
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
29 svn up
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
30 svn propset svn:externals '^/trunk/common/ext ext' d1
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
31 svn propset svn:externals '^/trunk/common/ext ext' d2
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
32 svn ci -m addexternals
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
33 cd ..
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
34 svn up
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
35 svn cp trunk branches/branch
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
36 cd branches
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
37 svn ci -m addbranch
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
38 cd branch
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
39 mkdir d3
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
40 echo d > d3/d
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
41 svn add d3
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
42 svn propset svn:externals '^/trunk/common/ext ext3' d3
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
43 svn ci -m touchbranch
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
44 cd ../../trunk
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
45 svn merge '^/branches/branch'
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
46 svn up
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
47 svn ci -m 'merge'
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
48 cd ../..
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
49
ba65c0b01d4f replay: copy copied directories externals
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
50 svnadmin dump testrepo > ../mergeexternals.svndump