Mercurial > hgsubversion

annotate tests/fixtures/tag_name_same_as_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 a8811c84e3ee
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
389
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 #!/bin/sh
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2 mkdir temp
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 cd temp
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 svnadmin create repo
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 REPOPATH="file://`pwd`/repo"
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 svn co $REPOPATH wc
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 cd wc
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 mkdir -p branches/magic trunk tags
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 svn add *
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 svn ci -m 'btt'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 cd branches/magic
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 for a in alpha beta gamma delta iota zeta eta theta ; do
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13 echo $a > $a
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14 svn add $a
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 svn ci -m "Add file $a"
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 done
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 cd ../..
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18 svn up
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 svn cp $REPOPATH/branches/magic $REPOPATH/tags/magic -m 'Make magic tag'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20 svn rm $REPOPATH/branches/magic/theta -m 'remove a file'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21 svn cp $REPOPATH/branches/magic $REPOPATH/tags/magic2 -m 'Tag magic again'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 cd ../..
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 svnadmin dump temp/repo > tag_name_same_as_branch.svndump
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25 echo
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 echo 'Complete.'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 echo 'You probably want to clean up temp now.'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 echo 'Dump in tag_name_same_as_branch.svndump'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 exit 0