Mercurial > hgsubversion

annotate tests/fixtures/simple_branch.sh @ 1170:61d4fb78370b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: fix pull when phases.new-commit=secret This was causing subtle failures during pull. I believe the line where we manually "set phase to public" isn't required any more, but more work is required to verify that behavior on all versions of hg, so we'll do that as a followup on default if needed.
author Augie Fackler <raf@durin42.com>
date Fri, 04 Apr 2014 21:27:55 -0400
parents bb00f7ca5b8c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1 #!/bin/sh
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
2 #
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
3 # Generate simple_branch.svndump
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
4 #
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
5
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
6 mkdir temp
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
7 cd temp
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
8
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
9 mkdir project-orig
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
10 cd project-orig
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
11 mkdir trunk branches tags
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
12 cd ..
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
13
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
14 svnadmin create testrepo
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
15 svnurl=file://`pwd`/testrepo
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
16 svn import --username durin project-orig $svnurl -m "Empty dirs."
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
17
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
18 svn co $svnurl project
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
19 cd project
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
20 echo 'file: alpha' > trunk/alpha
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
21 svn add trunk/alpha
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
22 svn ci --username durin -m 'Add alpha'
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
23 echo 'Data of beta' > trunk/beta
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
24 svn add trunk/beta
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
25 svn ci --username durin -m 'Add beta'
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
26 svn up
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
27 svn cp trunk branches/the_branch
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
28 svn ci --username durin -m 'Make a branch'
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
29 cd ..
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
30
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
31 svnadmin dump testrepo > ../simple_branch.svndump